From: huang zhibao <hzb@rock-chips.com>
Date: Sat, 18 Apr 2015 07:08:06 +0000 (+0800)
Subject: rk1000: rk1000 Standby power consumption processing
X-Git-Tag: firefly_0821_release~4158^2~186
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70244039d40cf2ec9d59957bdb2fca8970767b44;p=firefly-linux-kernel-4.4.55.git

rk1000: rk1000 Standby power consumption processing
---

diff --git a/drivers/mfd/rk1000-core.c b/drivers/mfd/rk1000-core.c
index 09d43d674906..68c6f86f7f4a 100755
--- a/drivers/mfd/rk1000-core.c
+++ b/drivers/mfd/rk1000-core.c
@@ -118,7 +118,7 @@ static int rk1000_control_suspend(struct device *dev)
 	DBG("ret=0x%x\n", ret);
 	ret = rk1000_i2c_send(I2C_ADDR_CTRL, CTRL_TVE, 0x07);
 	DBG("ret=0x%x\n", ret);
-	rk1000_reset_ctrl(0);
+	//rk1000_reset_ctrl(0);
 	return 0;
 }
 
@@ -126,7 +126,7 @@ static int rk1000_control_resume(struct device *dev)
 {
 	int ret;
 
-	rk1000_reset_ctrl(1);
+	//rk1000_reset_ctrl(1);
 	DBG("rk1000_control_resume\n");
 	/* ADC power off */
 	ret = rk1000_i2c_send(I2C_ADDR_CTRL, CTRL_ADC, 0x88);
diff --git a/sound/soc/codecs/rk1000_codec.c b/sound/soc/codecs/rk1000_codec.c
index ffc0b98a9bee..f97b797d3628 100755
--- a/sound/soc/codecs/rk1000_codec.c
+++ b/sound/soc/codecs/rk1000_codec.c
@@ -738,11 +738,13 @@ static int rk1000_codec_suspend(struct snd_soc_codec *codec)
 {
 	DBG("Enter::%s----%d\n", __func__, __LINE__);
 	spk_ctrl_fun(GPIO_LOW);
+	rk1000_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 	return 0;
 }
 
 static int rk1000_codec_resume(struct snd_soc_codec *codec)
 {
+	rk1000_codec_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
 	spk_ctrl_fun(GPIO_HIGH);
 	return 0;
 }