Date:2009-12-01 07:55:08 (10 years 6 months ago)
Author:xiangfu
Commit:e697a163d98ef40d618048a2f26d18f026d4a98d
Message:105-sound.patch
Files: include/sound/pcm.h (1 diff)
sound/core/pcm_native.c (1 diff)
sound/soc/Kconfig (1 diff)
sound/soc/Makefile (1 diff)
sound/soc/codecs/Kconfig (1 diff)
sound/soc/codecs/Makefile (2 diffs)

Change Details

include/sound/pcm.h
113113#define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */
114114#define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */
115115#define SNDRV_PCM_RATE_11025 (1<<2) /* 11025Hz */
116#define SNDRV_PCM_RATE_16000 (1<<3) /* 16000Hz */
117#define SNDRV_PCM_RATE_22050 (1<<4) /* 22050Hz */
118#define SNDRV_PCM_RATE_32000 (1<<5) /* 32000Hz */
119#define SNDRV_PCM_RATE_44100 (1<<6) /* 44100Hz */
120#define SNDRV_PCM_RATE_48000 (1<<7) /* 48000Hz */
121#define SNDRV_PCM_RATE_64000 (1<<8) /* 64000Hz */
122#define SNDRV_PCM_RATE_88200 (1<<9) /* 88200Hz */
123#define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */
124#define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */
125#define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */
116#define SNDRV_PCM_RATE_12000 (1<<3) /* 12000Hz */
117#define SNDRV_PCM_RATE_16000 (1<<4) /* 16000Hz */
118#define SNDRV_PCM_RATE_22050 (1<<5) /* 22050Hz */
119#define SNDRV_PCM_RATE_24000 (1<<6) /* 24000Hz */
120#define SNDRV_PCM_RATE_32000 (1<<7) /* 32000Hz */
121#define SNDRV_PCM_RATE_44100 (1<<8) /* 44100Hz */
122#define SNDRV_PCM_RATE_48000 (1<<9) /* 48000Hz */
123#define SNDRV_PCM_RATE_64000 (1<<10) /* 64000Hz */
124#define SNDRV_PCM_RATE_88200 (1<<11) /* 88200Hz */
125#define SNDRV_PCM_RATE_96000 (1<<12) /* 96000Hz */
126#define SNDRV_PCM_RATE_176400 (1<<13) /* 176400Hz */
127#define SNDRV_PCM_RATE_192000 (1<<14) /* 192000Hz */
126128
127129#define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */
128130#define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */
129131
130#define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\
131                     SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\
132                     SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100)
132#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)
133133#define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000)
134134#define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\
135135                     SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)
sound/core/pcm_native.c
17481748    return snd_interval_refine(hw_param_interval(params, rule->var), &t);
17491749}
17501750
1751#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
1751#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 14
17521752#error "Change this table"
17531753#endif
17541754
1755static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
1756                                 48000, 64000, 88200, 96000, 176400, 192000 };
1755static unsigned int rates[] = { 5512, 8000, 11025, 12000, 16000, 22050, 24000,
1756                32000, 44100, 48000, 64000, 88200, 96000,
1757                176400, 192000 };
17571758
17581759const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
17591760    .count = ARRAY_SIZE(rates),
sound/soc/Kconfig
3535source "sound/soc/s6000/Kconfig"
3636source "sound/soc/sh/Kconfig"
3737source "sound/soc/txx9/Kconfig"
38source "sound/soc/jz4740/Kconfig"
3839
3940# Supported codecs
4041source "sound/soc/codecs/Kconfig"
sound/soc/Makefile
1313obj-$(CONFIG_SND_SOC) += s6000/
1414obj-$(CONFIG_SND_SOC) += sh/
1515obj-$(CONFIG_SND_SOC) += txx9/
16obj-$(CONFIG_SND_SOC) += jz4740/
sound/soc/codecs/Kconfig
176176
177177config SND_SOC_WM9713
178178    tristate
179
180config SND_SOC_JZCODEC
181    tristate "JZ4720/JZ4740 SoC internal codec"
182    depends on SND_SOC && SOC_JZ4740
183    help
184      Say Y if you want to use internal codec on Ingenic JZ4720/JZ4740 based
185      boards.
sound/soc/codecs/Makefile
3434snd-soc-wm9705-objs := wm9705.o
3535snd-soc-wm9712-objs := wm9712.o
3636snd-soc-wm9713-objs := wm9713.o
37snd-soc-jzcodec-objs := jzcodec.o
3738
3839obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
3940obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o
...... 
7172obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
7273obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
7374obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
75obj-$(CONFIG_SND_SOC_JZCODEC) += snd-soc-jzcodec.o

Archive Download the corresponding diff file

Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master

Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9



interactive