From: 陈金泉 <chenjq@rock-chips.com>
Date: Mon, 15 Aug 2011 01:30:53 +0000 (+0800)
Subject: change codec driver for TCL phonepad
X-Git-Tag: firefly_0821_release~9772^2~20^2~4^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70ed7f8e90e08b7a3f596d82dccba5beec4a0559;p=firefly-linux-kernel-4.4.55.git

change codec driver for TCL phonepad
---

diff --git a/arch/arm/configs/rk29_phonepadsdk_defconfig b/arch/arm/configs/rk29_phonepadsdk_defconfig
index cc9916720368..c8a3e1780fa2 100644
--- a/arch/arm/configs/rk29_phonepadsdk_defconfig
+++ b/arch/arm/configs/rk29_phonepadsdk_defconfig
@@ -1521,8 +1521,8 @@ 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 is not set
-CONFIG_SND_RK29_SOC_I2S_8CH=y
+ CONFIG_SND_RK29_SOC_I2S_2CH=y
+#CONFIG_SND_RK29_SOC_I2S_8CH is not set
 # CONFIG_SND_RK29_SOC_WM8988 is not set
 # CONFIG_SND_RK29_SOC_WM8900 is not set
 # CONFIG_SND_RK29_SOC_alc5621 is not set
diff --git a/sound/soc/rk29/rk29_wm8994.c b/sound/soc/rk29/rk29_wm8994.c
index 40e63dcdd605..5c82142fb15b 100755
--- a/sound/soc/rk29/rk29_wm8994.c
+++ b/sound/soc/rk29/rk29_wm8994.c
@@ -180,7 +180,11 @@ static struct snd_soc_ops rk29_ops = {
 static struct snd_soc_dai_link rk29_dai = {
 	  .name = "WM8994",
 	  .stream_name = "WM8994 PCM",
-	  .cpu_dai = &rk29_i2s_dai[0],
+#ifdef CONFIG_MACH_RK29_PHONEPADSDK
+	  .cpu_dai = &rk29_i2s_dai[1],
+#else
+          .cpu_dai = &rk29_i2s_dai[1],
+#endif
 	  .codec_dai = &wm8994_dai,
 	  .init = rk29_wm8994_init,
 	  .ops = &rk29_ops,