From: yj <yangjie@rock-chips.com>
Date: Tue, 1 Apr 2014 13:39:01 +0000 (+0800)
Subject: rt5616: enable  capture
X-Git-Tag: firefly_0821_release~5651
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb3962d1295bd8752f7abca76474ef910afe64f3;p=firefly-linux-kernel-4.4.55.git

rt5616: enable  capture
---

diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index 84e63e886d93..da5ca65f9543 100755
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -28,7 +28,7 @@
 
 #include "rt5616.h"
 
-#define POWER_ON_MICBIAS1
+//#define POWER_ON_MICBIAS1
 
 //for gpio
 #define rt5616_CODEC_SET_SPK	1
@@ -1067,13 +1067,14 @@ static const struct snd_soc_dapm_route rt5616_dapm_routes[] = {
 	{"IN2P", NULL, "MIC2"},
 	{"IN2N", NULL, "MIC2"},
 
-	{"BST1", NULL, "IN1P"},
-	{"BST2", NULL, "IN2P"},
-	{"BST2", NULL, "IN2N"},
-#ifdef POWER_ON_MICBIAS1
+	{"micbias1", NULL, "IN1P"},
+	{"micbias1", NULL, "IN2P"},
+	{"micbias1", NULL, "IN2N"},
+
+//#ifdef POWER_ON_MICBIAS1
 	{"BST1", NULL, "micbias1"},
 	{"BST2", NULL, "micbias1"},
-#endif
+//#endif
 
 	{"INL1 VOL", NULL, "IN2P"},
 	{"INR1 VOL", NULL, "IN2N"},
diff --git a/sound/soc/rockchip/rk_rt5616.c b/sound/soc/rockchip/rk_rt5616.c
index 9100b80d75f6..b410bdfbbc74 100755
--- a/sound/soc/rockchip/rk_rt5616.c
+++ b/sound/soc/rockchip/rk_rt5616.c
@@ -101,6 +101,7 @@ static const struct snd_soc_dapm_route audio_map[]={
 
 	/* Mic Jack --> MIC_IN*/
 	{"MIC1", NULL, "Mic Jack"},
+	{"MIC2", NULL, "Mic Jack"},
 	//{"MIC1", NULL, "Mic Bias1"},
 	/* HP_OUT --> Headphone Jack */
 	{"Headphone Jack", NULL, "HPOL"},