| From 9ec1109c2ea5ed95cc502c3bfc9879bf23e844e2 Mon Sep 17 00:00:00 2001 |
| From: Stephan Gerhold <stephan@gerhold.net> |
| Date: Sat, 11 Jan 2020 17:40:03 +0100 |
| Subject: [PATCH] ASoC: msm8916-wcd-analog: Fix selected events for MIC BIAS |
| External1 |
| |
| commit e0beec88397b163c7c4ea6fcfb67e8e07a2671dc upstream. |
| |
| MIC BIAS External1 sets pm8916_wcd_analog_enable_micbias_ext1() |
| as event handler, which ends up in pm8916_wcd_analog_enable_micbias_ext(). |
| |
| But pm8916_wcd_analog_enable_micbias_ext() only handles the POST_PMU |
| event, which is not specified in the event flags for MIC BIAS External1. |
| This means that the code in the event handler is never actually run. |
| |
| Set SND_SOC_DAPM_POST_PMU as the only event for the handler to fix this. |
| |
| Fixes: 585e881e5b9e ("ASoC: codecs: Add msm8916-wcd analog codec") |
| Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Signed-off-by: Stephan Gerhold <stephan@gerhold.net> |
| Link: https://lore.kernel.org/r/20200111164006.43074-2-stephan@gerhold.net |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c |
| index aa9a8ac987dc..fad3d24a13e4 100644 |
| --- a/sound/soc/codecs/msm8916-wcd-analog.c |
| +++ b/sound/soc/codecs/msm8916-wcd-analog.c |
| @@ -888,10 +888,10 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = { |
| |
| SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0, |
| pm8916_wcd_analog_enable_micbias_ext1, |
| - SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), |
| + SND_SOC_DAPM_POST_PMU), |
| SND_SOC_DAPM_SUPPLY("MIC BIAS External2", CDC_A_MICB_2_EN, 7, 0, |
| pm8916_wcd_analog_enable_micbias_ext2, |
| - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), |
| + SND_SOC_DAPM_POST_PMU), |
| |
| SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0, |
| pm8916_wcd_analog_enable_adc, |
| -- |
| 2.7.4 |
| |
