change codec driver for TCL phonepad

diff --git a/arch/arm/configs/rk29_phonepadsdk_defconfig b/arch/arm/configs/rk29_phonepadsdk_defconfig
index cc9916720368aea94317d52b8c5fd3bdeb89fce6..c8a3e1780fa2851092ff41e8d9f5c98b947d594a 100644 (file)
--- 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 40e63dcdd605f859f3b1651987bea562dfd43f9d..5c82142fb15b85b8c7ab3963e7a8416c3d9f6b23 100755 (executable)
--- 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,