forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Change Codec for I2S0

Browse source
This commit is contained in:
fang 2010-12-22 17:50:39 +08:00
commit 403755052a
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/configs/rk29_sdk_defconfig
View file

@ -1216,12 +1216,12 @@ CONFIG_SND_USB=y
CONFIG_SND_SOC=y
CONFIG_SND_RK29_SOC=y
CONFIG_SND_RK29_SOC_I2S=y
CONFIG_SND_RK29_SOC_I2S_2CH=y
# CONFIG_SND_RK29_SOC_I2S_8CH is not set
# CONFIG_SND_RK29_SOC_I2S_2CH is not set
CONFIG_SND_RK29_SOC_I2S_8CH=y
# CONFIG_SND_RK29_SOC_WM8988 is not set
CONFIG_SND_RK29_SOC_WM8900=y
CONFIG_SND_RK29_CODEC_SOC_MASTER=y
# CONFIG_SND_RK29_CODEC_SOC_SLAVE is not set
# CONFIG_SND_RK29_CODEC_SOC_MASTER is not set
CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM8900=y

4
sound/soc/rk29/Kconfig
View file

@ -11,14 +11,14 @@ config SND_RK29_SOC_I2S
config SND_RK29_SOC_I2S_2CH
bool "Soc RK29 I2S 2 Channel support"
default y
default n
depends on SND_RK29_SOC_I2S
help
This supports the use of the 2 Channel I2S interface on rk29 processors.
config SND_RK29_SOC_I2S_8CH
bool "Soc RK29 I2S 8 Channel support"
default n
default y
depends on SND_RK29_SOC_I2S
help
This supports the use of the 8 Channel I2S interface on rk29 processors.

2
sound/soc/rk29/rk29_wm8900.c
View file

@ -169,7 +169,7 @@ static struct snd_soc_ops rk29_ops = {
static struct snd_soc_dai_link rk29_dai = {
.name = "WM8900",
.stream_name = "WM8900 PCM",
.cpu_dai = &rk29_i2s_dai[1],
.cpu_dai = &rk29_i2s_dai[0],
.codec_dai = &wm8900_dai,
.init = rk29_wm8900_init,
.ops = &rk29_ops,