rk3168:ds1006h add rk610 codec support

diff --git a/sound/soc/codecs/rk610_codec.c b/sound/soc/codecs/rk610_codec.c
index 9878a126829d6d9221b43fec610aab518244a3a2..d03c52613d68acb5f00c518ab9addb8c29a736cb 100755 (executable)
--- a/sound/soc/codecs/rk610_codec.c
+++ b/sound/soc/codecs/rk610_codec.c
@@ -42,7 +42,9 @@
 //you can look soc-core.c the resume source.s
 #define RESUME_PROBLEM 0
 
-#if defined(CONFIG_ARCH_RK3066B)
+#if defined(CONFIG_MACH_RK3168_DS1006H)
+#define RK610_SPK_CTRL_PIN  RK30_PIN2_PD7
+#elif defined(CONFIG_ARCH_RK3066B)
 #define RK610_SPK_CTRL_PIN  RK30_PIN2_PA0
 #elif defined(CONFIG_ARCH_RK30)
 #define RK610_SPK_CTRL_PIN  RK30_PIN4_PC6

diff --git a/sound/soc/rk29/rk29_jetta_codec.c b/sound/soc/rk29/rk29_jetta_codec.c
index e46a19353ffbb6caae21232e7d1f1d45660e11a5..97dd57cdc2b8b3a9bbbde99582ee7e06634c89cb 100755 (executable)
--- a/sound/soc/rk29/rk29_jetta_codec.c
+++ b/sound/soc/rk29/rk29_jetta_codec.c
@@ -127,7 +127,11 @@ static struct snd_soc_ops rk29_ops = {
 static struct snd_soc_dai_link rk29_dai = {
        .name = "RK610_CODEC",
        .stream_name = "RK610 CODEC PCM",
+#if defined(CONFIG_MACH_RK3168_DS1006H)
+       .codec_name = "RK610_CODEC.4-0060",
+#else
        .codec_name = "RK610_CODEC.0-0060",
+#endif
        .platform_name = "rockchip-audio",
 #if defined(CONFIG_SND_RK29_SOC_I2S_8CH)       
        .cpu_dai_name = "rk29_i2s.0",