| 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 | ||
|---|---|---|
| 113 | 113 | #define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */ |
| 114 | 114 | #define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */ |
| 115 | 115 | #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 */ | |
| 126 | 128 | |
| 127 | 129 | #define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */ |
| 128 | 130 | #define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */ |
| 129 | 131 | |
| 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) | |
| 133 | 133 | #define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000) |
| 134 | 134 | #define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\ |
| 135 | 135 | SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000) |
| sound/core/pcm_native.c | ||
|---|---|---|
| 1721 | 1721 | return snd_interval_refine(hw_param_interval(params, rule->var), &t); |
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 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 | |
| 1725 | 1725 | #error "Change this table" |
| 1726 | 1726 | #endif |
| 1727 | 1727 | |
| 1728 | static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100, | |
| 1729 | 48000, 64000, 88200, 96000, 176400, 192000 }; | |
| 1728 | static unsigned int rates[] = { 5512, 8000, 11025, 12000, 16000, 22050, 24000, | |
| 1729 | 32000, 44100, 48000, 64000, 88200, 96000, | |
| 1730 | 176400, 192000 }; | |
| 1730 | 1731 | |
| 1731 | 1732 | const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = { |
| 1732 | 1733 | .count = ARRAY_SIZE(rates), |
| sound/soc/Kconfig | ||
|---|---|---|
| 36 | 36 | source "sound/soc/s6000/Kconfig" |
| 37 | 37 | source "sound/soc/sh/Kconfig" |
| 38 | 38 | source "sound/soc/txx9/Kconfig" |
| 39 | source "sound/soc/jz4740/Kconfig" | |
| 39 | 40 | |
| 40 | 41 | # Supported codecs |
| 41 | 42 | source "sound/soc/codecs/Kconfig" |
| sound/soc/Makefile | ||
|---|---|---|
| 14 | 14 | obj-$(CONFIG_SND_SOC) += s6000/ |
| 15 | 15 | obj-$(CONFIG_SND_SOC) += sh/ |
| 16 | 16 | obj-$(CONFIG_SND_SOC) += txx9/ |
| 17 | obj-$(CONFIG_SND_SOC) += jz4740/ | |
| sound/soc/codecs/Kconfig | ||
|---|---|---|
| 217 | 217 | config SND_SOC_WM9713 |
| 218 | 218 | tristate |
| 219 | 219 | |
| 220 | config 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 | ||
| 220 | 227 | # Amp |
| 221 | 228 | config SND_SOC_MAX9877 |
| 222 | 229 | tristate |
| sound/soc/codecs/Makefile | ||
|---|---|---|
| 44 | 44 | snd-soc-wm9712-objs := wm9712.o |
| 45 | 45 | snd-soc-wm9713-objs := wm9713.o |
| 46 | 46 | snd-soc-wm-hubs-objs := wm_hubs.o |
| 47 | snd-soc-jzcodec-objs := jzcodec.o | |
| 47 | 48 | |
| 48 | 49 | # Amp |
| 49 | 50 | snd-soc-max9877-objs := max9877.o |
| ... | ... | |
| 94 | 95 | obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o |
| 95 | 96 | obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o |
| 96 | 97 | obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o |
| 98 | obj-$(CONFIG_SND_SOC_JZCODEC) += snd-soc-jzcodec.o | |
| 97 | 99 | |
| 98 | 100 | # Amp |
| 99 | 101 | obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o |
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
