diff options
| author | Simon Je <sje@nvidia.com> | 2014-04-02 13:23:04 +0900 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-04-03 20:52:31 -0700 |
| commit | e8cb21d9b39860186febd08c98935f1df87c1fca (patch) | |
| tree | e3895374bd748eba80d43259e3f7529f768f838a | |
| parent | b1f5a4392f6e7822676bea4e6c95c980f4d5ee73 (diff) | |
Revert "Asoc: ALC5639: ALC5640: Fix HS det. issue in BIAS OFF state"
This reverts commit 5c7cb1dd558fa95521cce4416976157bc13f9d9a.
Bug 1470687
Change-Id: I5b0b47e5cd109607e6e8c98355a3deacd3093b52
Signed-off-by: Simon Je <sje@nvidia.com>
(cherry picked from commit c0e40b1c45c8c1c8fdf19829d6dd38dd9c90f503)
Reviewed-on: http://git-master/r/391602
GVS: Gerrit_Virtual_Submit
Reviewed-by: Harry Hong <hhong@nvidia.com>
| -rw-r--r-- | sound/soc/codecs/rt5639.c | 9 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/codecs/rt5639.c b/sound/soc/codecs/rt5639.c index 19ccd32bcb13..7aa225e1ce85 100644 --- a/sound/soc/codecs/rt5639.c +++ b/sound/soc/codecs/rt5639.c @@ -57,7 +57,7 @@ static struct rt5639_init_reg init_list[] = { {RT5639_PRIV_INDEX ,0x001B}, //MX6A {RT5639_PRIV_DATA ,0x0200}, //MX6C - {RT5639_GEN_CTRL1 , 0x3b01},/* fa[12:13] = 1'b; + {RT5639_GEN_CTRL1 , 0x3f01},/* fa[12:13] = 1'b; fa[8~11]=1; fa[0]=1 */ {RT5639_ADDA_CLK1 , 0x1114},/* 73[2] = 1'b */ {RT5639_MICBIAS , 0x3030},/* 93[5:4] = 11'b */ @@ -527,7 +527,7 @@ int rt5639_headset_detect(struct snd_soc_codec *codec, int jack_insert) if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) { snd_soc_write(codec, RT5639_PWR_ANLG1, 0xa814); snd_soc_write(codec, RT5639_MICBIAS, 0x3830); - snd_soc_write(codec, RT5639_GEN_CTRL1 , 0x3b01); + snd_soc_write(codec, RT5639_GEN_CTRL1 , 0x3701); sclk_src = snd_soc_read(codec, RT5639_GLB_CLK) & RT5639_SCLK_SRC_MASK; snd_soc_update_bits(codec, RT5639_GLB_CLK, @@ -2940,7 +2940,7 @@ static int rt5639_set_bias_level(struct snd_soc_codec *codec, snd_soc_update_bits(codec, RT5639_PWR_ANLG1, RT5639_PWR_FV1 | RT5639_PWR_FV2, RT5639_PWR_FV1 | RT5639_PWR_FV2); - snd_soc_write(codec, RT5639_GEN_CTRL1, 0x3b01); + snd_soc_write(codec, RT5639_GEN_CTRL1, 0x3701); codec->cache_only = false; codec->cache_sync = 1; snd_soc_cache_sync(codec); @@ -2951,7 +2951,7 @@ static int rt5639_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: snd_soc_write(codec, RT5639_DEPOP_M1, 0x0004); snd_soc_write(codec, RT5639_DEPOP_M2, 0x1100); - snd_soc_write(codec, RT5639_GEN_CTRL1, 0x3b01); + snd_soc_write(codec, RT5639_GEN_CTRL1, 0x3700); snd_soc_write(codec, RT5639_PWR_DIG1, 0x0000); snd_soc_write(codec, RT5639_PWR_DIG2, 0x0000); snd_soc_write(codec, RT5639_PWR_VOL, 0x0000); @@ -2982,7 +2982,6 @@ static int rt5639_probe(struct snd_soc_codec *codec) mutex_lock(&rt5639->lock); CHECK_I2C_SHUTDOWN(rt5639, codec) - codec->dapm.idle_bias_off = 1; pr_info("Codec driver version %s\n", VERSION); diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 736253a177ba..94c1ab1e3b94 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -46,7 +46,7 @@ struct rt5640_init_reg { }; static struct rt5640_init_reg init_list[] = { - {RT5640_GEN_CTRL1 , 0x3b01},/*fa[12:13] = 1'b; fa[8~10]=1; fa[0]=1 */ + {RT5640_GEN_CTRL1 , 0x3701},/*fa[12:13] = 1'b; fa[8~10]=1; fa[0]=1 */ {RT5640_DEPOP_M1 , 0x0019},/* 8e[4:3] = 11'b; 8e[0] = 1'b */ {RT5640_DEPOP_M2 , 0x3100},/* 8f[13] = 1'b */ {RT5640_ADDA_CLK1 , 0x1114},/* 73[2] = 1'b */ @@ -496,7 +496,7 @@ int rt5640_headset_detect(struct snd_soc_codec *codec, int jack_insert) if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) { snd_soc_write(codec, RT5640_PWR_ANLG1, 0x2004); snd_soc_write(codec, RT5640_MICBIAS, 0x3830); - snd_soc_write(codec, RT5640_GEN_CTRL1 , 0x3b01); + snd_soc_write(codec, RT5640_GEN_CTRL1 , 0x3701); } sclk_src = snd_soc_read(codec, RT5640_GLB_CLK) & RT5640_SCLK_SRC_MASK; @@ -2698,7 +2698,7 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec, snd_soc_update_bits(codec, RT5640_PWR_ANLG1, RT5640_PWR_FV1 | RT5640_PWR_FV2, RT5640_PWR_FV1 | RT5640_PWR_FV2); - snd_soc_write(codec, RT5640_GEN_CTRL1, 0x3b01); + snd_soc_write(codec, RT5640_GEN_CTRL1, 0x3701); codec->cache_only = false; codec->cache_sync = 1; snd_soc_cache_sync(codec); @@ -2719,7 +2719,7 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec, #endif snd_soc_write(codec, RT5640_DEPOP_M1, 0x0004); snd_soc_write(codec, RT5640_DEPOP_M2, 0x1100); - snd_soc_write(codec, RT5640_GEN_CTRL1, 0x3b01); + snd_soc_write(codec, RT5640_GEN_CTRL1, 0x3700); snd_soc_write(codec, RT5640_PWR_DIG1, 0x0000); snd_soc_write(codec, RT5640_PWR_DIG2, 0x0000); snd_soc_write(codec, RT5640_PWR_VOL, 0x0000); |