diff options
| author | Divya Ojha <dojha@codeaurora.org> | 2017-02-13 18:49:47 +0530 |
|---|---|---|
| committer | Divya Ojha <dojha@codeaurora.org> | 2017-02-21 23:50:37 +0530 |
| commit | b3c1879704b429cc9cf192b02eebd2071c78fec8 (patch) | |
| tree | 826cf124c54ed313f5fc8b947fa740c75ba1d92d /sound/soc | |
| parent | 3a7e752617514960c5cecdf84e12b13dc63c04c7 (diff) | |
ASoC: sdm660-cdc: Fix codec power up and down sequence
Correct widget type for proper power up sequence. Pops are heard
on headset with incorrect sequence.
CRs-Fixed: 2001499
Change-Id: I98703738434f99e5c8778ccd4432c66b380d78a5
Signed-off-by: Divya Ojha <dojha@codeaurora.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 8f7db4d13378..5323c0465682 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -1453,7 +1453,6 @@ static int msm_anlg_cdc_codec_enable_clock_block(struct snd_soc_codec *codec, } else { snd_soc_update_bits(codec, MSM89XX_PMIC_DIGITAL_CDC_TOP_CLK_CTL, 0x0C, 0x00); - msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_CLK_OFF); } return 0; } @@ -3500,18 +3499,24 @@ static const struct snd_soc_dapm_widget msm_anlg_cdc_dapm_widgets[] = { SND_SOC_DAPM_INPUT("AMIC1"), SND_SOC_DAPM_INPUT("AMIC2"), SND_SOC_DAPM_INPUT("AMIC3"), - SND_SOC_DAPM_INPUT("PDM_IN_RX1"), - SND_SOC_DAPM_INPUT("PDM_IN_RX2"), - SND_SOC_DAPM_INPUT("PDM_IN_RX3"), + SND_SOC_DAPM_AIF_IN("PDM_IN_RX1", "PDM Playback", + 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_IN("PDM_IN_RX2", "PDM Playback", + 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_IN("PDM_IN_RX3", "PDM Playback", + 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_OUTPUT("EAR"), SND_SOC_DAPM_OUTPUT("WSA_SPK OUT"), SND_SOC_DAPM_OUTPUT("HEADPHONE"), SND_SOC_DAPM_OUTPUT("SPK_OUT"), SND_SOC_DAPM_OUTPUT("LINEOUT"), - SND_SOC_DAPM_OUTPUT("ADC1_OUT"), - SND_SOC_DAPM_OUTPUT("ADC2_OUT"), - SND_SOC_DAPM_OUTPUT("ADC3_OUT"), + SND_SOC_DAPM_AIF_OUT("ADC1_OUT", "PDM Capture", + 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("ADC2_OUT", "PDM Capture", + 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("ADC3_OUT", "PDM Capture", + 0, SND_SOC_NOPM, 0, 0), }; static const struct sdm660_cdc_reg_mask_val msm_anlg_cdc_reg_defaults[] = { |