diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-19 09:52:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-19 09:52:39 -0800 |
| commit | 29bcd5781b7f2992510a684d8fad683dd0804ea9 (patch) | |
| tree | e5e78383a379a6c9908b893850f7b469141a898f | |
| parent | 59656208b78a9be48abf4039b0139449bef4af56 (diff) | |
| parent | a4e8864f26197b412b336aa9e9d8dfc856aa8098 (diff) | |
Merge "ASoC: wcd934x: Add delay during headphone path bringup and teardown"
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x.c | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index f88802315d0e..86ad8752b6ff 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1919,10 +1919,14 @@ static int tavil_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_POST_PMU: /* * 7ms sleep is required after PA is enabled as per - * HW requirement + * HW requirement. If compander is disabled, then + * 20ms delay is needed. */ if (test_bit(HPH_PA_DELAY, &tavil->status_mask)) { - usleep_range(7000, 7100); + if (!tavil->comp_enabled[COMPANDER_2]) + usleep_range(20000, 20100); + else + usleep_range(7000, 7100); clear_bit(HPH_PA_DELAY, &tavil->status_mask); } @@ -1961,10 +1965,18 @@ static int tavil_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, snd_soc_update_bits(codec, WCD934X_HPH_R_TEST, 0x01, 0x00); snd_soc_update_bits(codec, WCD934X_CDC_RX2_RX_PATH_CTL, 0x10, 0x10); + snd_soc_update_bits(codec, WCD934X_CDC_RX2_RX_PATH_MIX_CTL, + 0x10, 0x10); break; case SND_SOC_DAPM_POST_PMD: - /* 5ms sleep is required after PA disable */ - usleep_range(5000, 5100); + /* + * 5ms sleep is required after PA disable. If compander is + * disabled, then 20ms delay is needed after PA disable. + */ + if (!tavil->comp_enabled[COMPANDER_2]) + usleep_range(20000, 20100); + else + usleep_range(5000, 5100); tavil_codec_override(codec, tavil->hph_mode, event); blocking_notifier_call_chain(&tavil->mbhc->notifier, WCD_EVENT_POST_HPHR_PA_OFF, @@ -2004,10 +2016,14 @@ static int tavil_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_POST_PMU: /* * 7ms sleep is required after PA is enabled as per - * HW requirement + * HW requirement. If compander is disabled, then + * 20ms delay is needed. */ if (test_bit(HPH_PA_DELAY, &tavil->status_mask)) { - usleep_range(7000, 7100); + if (!tavil->comp_enabled[COMPANDER_1]) + usleep_range(20000, 20100); + else + usleep_range(7000, 7100); clear_bit(HPH_PA_DELAY, &tavil->status_mask); } snd_soc_update_bits(codec, WCD934X_HPH_L_TEST, 0x01, 0x01); @@ -2045,10 +2061,18 @@ static int tavil_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, snd_soc_update_bits(codec, WCD934X_HPH_L_TEST, 0x01, 0x00); snd_soc_update_bits(codec, WCD934X_CDC_RX1_RX_PATH_CTL, 0x10, 0x10); + snd_soc_update_bits(codec, WCD934X_CDC_RX1_RX_PATH_MIX_CTL, + 0x10, 0x10); break; case SND_SOC_DAPM_POST_PMD: - /* 5ms sleep is required after PA disable */ - usleep_range(5000, 5100); + /* + * 5ms sleep is required after PA disable. If compander is + * disabled, then 20ms delay is needed after PA disable. + */ + if (!tavil->comp_enabled[COMPANDER_1]) + usleep_range(20000, 20100); + else + usleep_range(5000, 5100); tavil_codec_override(codec, tavil->hph_mode, event); blocking_notifier_call_chain(&tavil->mbhc->notifier, WCD_EVENT_POST_HPHL_PA_OFF, |