Date:2010-01-11 04:29:46 (10 years 4 months ago)
Author:Lars C.
Commit:542d75a7c442805ea882acc51140564ef2bd4a8b
Message:From bc6998405cdff2c189ad6e3e18be695087c30909 Mon Sep 17 00:00:00 2001 Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/105-sound.pa tch

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
17211721    return snd_interval_refine(hw_param_interval(params, rule->var), &t);
17221722}
17231723
1724#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
1724#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 14
17251725#error "Change this table"
17261726#endif
17271727
1728static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
1729                                 48000, 64000, 88200, 96000, 176400, 192000 };
1728static unsigned int rates[] = { 5512, 8000, 11025, 12000, 16000, 22050, 24000,
1729                32000, 44100, 48000, 64000, 88200, 96000,
1730                176400, 192000 };
17301731
17311732const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
17321733    .count = ARRAY_SIZE(rates),
sound/soc/Kconfig
3636source "sound/soc/s6000/Kconfig"
3737source "sound/soc/sh/Kconfig"
3838source "sound/soc/txx9/Kconfig"
39source "sound/soc/jz4740/Kconfig"
3940
4041# Supported codecs
4142source "sound/soc/codecs/Kconfig"
sound/soc/Makefile
1414obj-$(CONFIG_SND_SOC) += s6000/
1515obj-$(CONFIG_SND_SOC) += sh/
1616obj-$(CONFIG_SND_SOC) += txx9/
17obj-$(CONFIG_SND_SOC) += jz4740/
sound/soc/codecs/Kconfig
217217config SND_SOC_WM9713
218218    tristate
219219
220config SND_SOC_JZCODEC
221    tristate "JZ4720/JZ4740 SoC internal codec"
222    depends on SND_SOC && SOC_JZ4740
223    help
224      Say Y if you want to use internal codec on Ingenic JZ4720/JZ4740 based
225      boards.
226
220227# Amp
221228config SND_SOC_MAX9877
222229    tristate
sound/soc/codecs/Makefile
4444snd-soc-wm9712-objs := wm9712.o
4545snd-soc-wm9713-objs := wm9713.o
4646snd-soc-wm-hubs-objs := wm_hubs.o
47snd-soc-jzcodec-objs := jzcodec.o
4748
4849# Amp
4950snd-soc-max9877-objs := max9877.o
...... 
9495obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
9596obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
9697obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
98obj-$(CONFIG_SND_SOC_JZCODEC) += snd-soc-jzcodec.o
9799
98100# Amp
99101obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o

Archive Download the corresponding diff file



interactive