From: hxy <hxy@rock-chips.com>
Date: Mon, 31 Dec 2012 11:09:17 +0000 (+0800)
Subject: rk3168:ds1006h add rk610 codec support
X-Git-Tag: firefly_0821_release~8020
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f0d80963314c36f4432324184feaad166841369;p=firefly-linux-kernel-4.4.55.git

rk3168:ds1006h add rk610 codec support
---

diff --git a/sound/soc/codecs/rk610_codec.c b/sound/soc/codecs/rk610_codec.c
index 9878a126829d..d03c52613d68 100755
--- 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 e46a19353ffb..97dd57cdc2b8 100755
--- 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",