diff options
author | Phani Kumar Uppalapati <phaniu@codeaurora.org> | 2013-07-12 22:48:45 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2013-09-04 17:16:00 -0700 |
commit | 7dde934ce8793e1e7e8b50b860de25e4aafa9f03 (patch) | |
tree | dde316520281cfea5140ac5b7275b401dd4cab9e /sound | |
parent | 7a92a63477eabe7a975800c40ced7cb1da90b135 (diff) |
ASoC: msm: Enable current source for plug type detection
Enable current source for detecting plug type on tapan.
Update cs_enable_flags accordingly to use current source
during insertion, polling and removal of the plug.
Change-Id: Iab8a79ef377b5a3bdf9cefa6a9b5ad33ece9c8a7
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wcd9306.c | 2 | ||||
-rw-r--r-- | sound/soc/msm/msm8226.c | 5 | ||||
-rw-r--r-- | sound/soc/msm/msm8974.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/codecs/wcd9306.c b/sound/soc/codecs/wcd9306.c index ea638f367eeb..3e6cf792079f 100644 --- a/sound/soc/codecs/wcd9306.c +++ b/sound/soc/codecs/wcd9306.c @@ -4589,7 +4589,7 @@ static void tapan_codec_specific_cal_setup(struct snd_soc_codec *codec, struct wcd9xxx_mbhc *mbhc) { snd_soc_update_bits(codec, WCD9XXX_A_CDC_MBHC_B1_CTL, - 0x0C, 0x04); + 0x04, 0x04); snd_soc_update_bits(codec, WCD9XXX_A_TX_7_MBHC_EN, 0xE0, 0xE0); } diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c index 4f81c54e54b6..6033f900edbd 100644 --- a/sound/soc/msm/msm8226.c +++ b/sound/soc/msm/msm8226.c @@ -83,6 +83,9 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { .micbias_enable_flags = 1 << MBHC_MICBIAS_ENABLE_THRESHOLD_HEADSET, .insert_detect = true, .swap_gnd_mic = NULL, + .cs_enable_flags = (1 << MBHC_CS_ENABLE_POLLING | + 1 << MBHC_CS_ENABLE_INSERTION | + 1 << MBHC_CS_ENABLE_REMOVAL), }; struct msm_auxpcm_gpio { @@ -788,7 +791,7 @@ void *def_tapan_mbhc_cal(void) S(c[1], 124); S(nc, 1); S(n_meas, 5); - S(mbhc_nsc, 11); + S(mbhc_nsc, 10); S(n_btn_meas, 1); S(n_btn_con, 2); S(num_btn, WCD9XXX_MBHC_DEF_BUTTONS); diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c index be9a90c0ab49..b604dcbe9ef8 100644 --- a/sound/soc/msm/msm8974.c +++ b/sound/soc/msm/msm8974.c @@ -133,6 +133,9 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { .micbias_enable_flags = 1 << MBHC_MICBIAS_ENABLE_THRESHOLD_HEADSET, .insert_detect = true, .swap_gnd_mic = NULL, + .cs_enable_flags = (1 << MBHC_CS_ENABLE_POLLING | + 1 << MBHC_CS_ENABLE_INSERTION | + 1 << MBHC_CS_ENABLE_REMOVAL), }; struct msm_auxpcm_gpio { |