summaryrefslogtreecommitdiff
path: root/target/linux/xburst/patches-2.6.32/105-sound.patch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-11 04:44:45 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-01-11 04:44:45 +0000
commit541158d5ad4a941d927a397737b6588d2e4db22d (patch)
treee49a97f18123413611824b8993e9acff9d681bae /target/linux/xburst/patches-2.6.32/105-sound.patch
parentdb06ca593b3d80ec514ecb2b20d49e3638cd3f0b (diff)
downloadmtk-20170518-541158d5ad4a941d927a397737b6588d2e4db22d.zip
mtk-20170518-541158d5ad4a941d927a397737b6588d2e4db22d.tar.gz
mtk-20170518-541158d5ad4a941d927a397737b6588d2e4db22d.tar.bz2
Merge xburst target.
SVN-Revision: 19098
Diffstat (limited to 'target/linux/xburst/patches-2.6.32/105-sound.patch')
-rw-r--r--target/linux/xburst/patches-2.6.32/105-sound.patch138
1 files changed, 138 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.32/105-sound.patch b/target/linux/xburst/patches-2.6.32/105-sound.patch
new file mode 100644
index 0000000..7e2fd3d
--- /dev/null
+++ b/target/linux/xburst/patches-2.6.32/105-sound.patch
@@ -0,0 +1,138 @@
+From bc6998405cdff2c189ad6e3e18be695087c30909 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Mon, 11 Jan 2010 04:29:46 +0100
+Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/105-sound.patch
+
+---
+ include/sound/pcm.h | 26 +++++++++++++-------------
+ sound/core/pcm_native.c | 7 ++++---
+ sound/soc/Kconfig | 1 +
+ sound/soc/Makefile | 1 +
+ sound/soc/codecs/Kconfig | 7 +++++++
+ sound/soc/codecs/Makefile | 2 ++
+ 6 files changed, 28 insertions(+), 16 deletions(-)
+
+diff --git a/include/sound/pcm.h b/include/sound/pcm.h
+index de6d981..6ecc22b 100644
+--- a/include/sound/pcm.h
++++ b/include/sound/pcm.h
+@@ -113,23 +113,23 @@ struct snd_pcm_ops {
+ #define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */
+ #define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */
+ #define SNDRV_PCM_RATE_11025 (1<<2) /* 11025Hz */
+-#define SNDRV_PCM_RATE_16000 (1<<3) /* 16000Hz */
+-#define SNDRV_PCM_RATE_22050 (1<<4) /* 22050Hz */
+-#define SNDRV_PCM_RATE_32000 (1<<5) /* 32000Hz */
+-#define SNDRV_PCM_RATE_44100 (1<<6) /* 44100Hz */
+-#define SNDRV_PCM_RATE_48000 (1<<7) /* 48000Hz */
+-#define SNDRV_PCM_RATE_64000 (1<<8) /* 64000Hz */
+-#define SNDRV_PCM_RATE_88200 (1<<9) /* 88200Hz */
+-#define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */
+-#define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */
+-#define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */
++#define SNDRV_PCM_RATE_12000 (1<<3) /* 12000Hz */
++#define SNDRV_PCM_RATE_16000 (1<<4) /* 16000Hz */
++#define SNDRV_PCM_RATE_22050 (1<<5) /* 22050Hz */
++#define SNDRV_PCM_RATE_24000 (1<<6) /* 24000Hz */
++#define SNDRV_PCM_RATE_32000 (1<<7) /* 32000Hz */
++#define SNDRV_PCM_RATE_44100 (1<<8) /* 44100Hz */
++#define SNDRV_PCM_RATE_48000 (1<<9) /* 48000Hz */
++#define SNDRV_PCM_RATE_64000 (1<<10) /* 64000Hz */
++#define SNDRV_PCM_RATE_88200 (1<<11) /* 88200Hz */
++#define SNDRV_PCM_RATE_96000 (1<<12) /* 96000Hz */
++#define SNDRV_PCM_RATE_176400 (1<<13) /* 176400Hz */
++#define SNDRV_PCM_RATE_192000 (1<<14) /* 192000Hz */
+
+ #define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */
+ #define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */
+
+-#define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\
+- SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\
+- SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100)
++#define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|SNDRV_PCM_RATE_12000|SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|SNDRV_PCM_RATE_24000|SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100)
+ #define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000)
+ #define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\
+ SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)
+diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
+index ab73edf..35c22d7 100644
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
+@@ -1721,12 +1721,13 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,
+ return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+ }
+
+-#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
++#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 14
+ #error "Change this table"
+ #endif
+
+-static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
+- 48000, 64000, 88200, 96000, 176400, 192000 };
++static unsigned int rates[] = { 5512, 8000, 11025, 12000, 16000, 22050, 24000,
++ 32000, 44100, 48000, 64000, 88200, 96000,
++ 176400, 192000 };
+
+ const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
+ .count = ARRAY_SIZE(rates),
+diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
+index b1749bc..5a7a724 100644
+--- a/sound/soc/Kconfig
++++ b/sound/soc/Kconfig
+@@ -36,6 +36,7 @@ source "sound/soc/s3c24xx/Kconfig"
+ source "sound/soc/s6000/Kconfig"
+ source "sound/soc/sh/Kconfig"
+ source "sound/soc/txx9/Kconfig"
++source "sound/soc/jz4740/Kconfig"
+
+ # Supported codecs
+ source "sound/soc/codecs/Kconfig"
+diff --git a/sound/soc/Makefile b/sound/soc/Makefile
+index 0c5eac0..8e7b5cb 100644
+--- a/sound/soc/Makefile
++++ b/sound/soc/Makefile
+@@ -14,3 +14,4 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/
+ obj-$(CONFIG_SND_SOC) += s6000/
+ obj-$(CONFIG_SND_SOC) += sh/
+ obj-$(CONFIG_SND_SOC) += txx9/
++obj-$(CONFIG_SND_SOC) += jz4740/
+diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
+index 0edca93..cd5e44a 100644
+--- a/sound/soc/codecs/Kconfig
++++ b/sound/soc/codecs/Kconfig
+@@ -217,6 +217,13 @@ config SND_SOC_WM9712
+ config SND_SOC_WM9713
+ tristate
+
++config SND_SOC_JZCODEC
++ tristate "JZ4720/JZ4740 SoC internal codec"
++ depends on SND_SOC && SOC_JZ4740
++ help
++ Say Y if you want to use internal codec on Ingenic JZ4720/JZ4740 based
++ boards.
++
+ # Amp
+ config SND_SOC_MAX9877
+ tristate
+diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
+index fb4af28..d58b0fa 100644
+--- a/sound/soc/codecs/Makefile
++++ b/sound/soc/codecs/Makefile
+@@ -44,6 +44,7 @@ snd-soc-wm9705-objs := wm9705.o
+ snd-soc-wm9712-objs := wm9712.o
+ snd-soc-wm9713-objs := wm9713.o
+ snd-soc-wm-hubs-objs := wm_hubs.o
++snd-soc-jzcodec-objs := jzcodec.o
+
+ # Amp
+ snd-soc-max9877-objs := max9877.o
+@@ -94,6 +95,7 @@ obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
+ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
+ obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
+ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
++obj-$(CONFIG_SND_SOC_JZCODEC) += snd-soc-jzcodec.o
+
+ # Amp
+ obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
+--
+1.5.6.5
+