From 96e0741e03626a672addf79d156969bf97f40e98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=82=B1=E5=BB=BA=E6=96=8C?= Date: Tue, 26 Mar 2013 17:29:44 +0800 Subject: [PATCH] i2s : SND_RK29_SOC_I2S_2CH default y if (ARCH_RK3066B || ARCH_RK3188) --- sound/soc/rk29/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/rk29/Kconfig b/sound/soc/rk29/Kconfig index b6b6af2f410b..31e4d677fa7e 100755 --- a/sound/soc/rk29/Kconfig +++ b/sound/soc/rk29/Kconfig @@ -10,8 +10,8 @@ config SND_RK29_SOC_I2S tristate config SND_RK29_SOC_I2S_8CH - bool "Soc RK29 I2S 8 Channel support(I2S0)" - default y + bool "Soc RK29 I2S 8 Channel support(I2S0)" + default y depends on SND_RK29_SOC_I2S && !ARCH_RK3066B && !ARCH_RK3188 help This supports the use of the 8 Channel I2S interface on rk29 processors. @@ -29,9 +29,9 @@ endchoice endif config SND_RK29_SOC_I2S_2CH - bool "Soc RK29 I2S 2 Channel support(I2S1)" - default n - depends on SND_RK29_SOC_I2S && !ARCH_RK2928 + bool "Soc RK29 I2S 2 Channel support(I2S1)" + depends on SND_RK29_SOC_I2S && !ARCH_RK2928 + default y if (ARCH_RK3066B || ARCH_RK3188) help This supports the use of the 2 Channel I2S interface on rk29 processors. @@ -60,6 +60,7 @@ config SND_RK29_SOC_SPDIF depends on SND_RK29_SOC_I2S help This supports the use of SPDIF interface on rk29 processors + config SND_RK29_SOC_ES8323 tristate "SoC I2S Audio support for rockchip - ES8323" depends on SND_RK29_SOC @@ -69,7 +70,6 @@ config SND_RK29_SOC_ES8323 Say Y if you want to add support for SoC audio on rockchip with the ES8323. - config SND_RK29_SOC_WM8988 tristate "SoC I2S Audio support for rockchip - WM8988" depends on SND_RK29_SOC @@ -253,7 +253,7 @@ config SND_RK_SOC_RK2928 Say Y if you want to add support for SoC audio on rockchip with the RK2928 internal codec. -if SND_RK29_SOC_I2S_2CH || SND_RK29_SOC_I2S_8CH || SND_RK_SOC_I2S2_2CH || SND_RK29_SOC_ES8323 +if SND_RK29_SOC_I2S_2CH || SND_RK29_SOC_I2S_8CH || SND_RK_SOC_I2S2_2CH choice bool "Set i2s type" default SND_RK29_CODEC_SOC_SLAVE -- 2.34.1