From: fang <fang@fang-desktop.(none)>
Date: Wed, 22 Dec 2010 09:50:39 +0000 (+0800)
Subject: Change Codec for I2S0
X-Git-Tag: firefly_0821_release~10899^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=403755052aeade7c32034eeddaeeb6fa084c705a;p=firefly-linux-kernel-4.4.55.git

Change Codec for I2S0
---

diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index 589bf6fd406a..b7e915c3a52c 100755
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -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
diff --git a/sound/soc/rk29/Kconfig b/sound/soc/rk29/Kconfig
index d2d5b0d4adee..37f8ce9860d1 100755
--- a/sound/soc/rk29/Kconfig
+++ b/sound/soc/rk29/Kconfig
@@ -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.
diff --git a/sound/soc/rk29/rk29_wm8900.c b/sound/soc/rk29/rk29_wm8900.c
index 480464cd0ae0..c82169294ba3 100644
--- a/sound/soc/rk29/rk29_wm8900.c
+++ b/sound/soc/rk29/rk29_wm8900.c
@@ -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,