Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d34ff1 authored by Divya Ojha's avatar Divya Ojha Committed by Banajit Goswami
Browse files

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: default avatarDivya Ojha <dojha@codeaurora.org>
parent 578305c2

sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -1451,7 +1451,6 @@ static int msm_anlg_cdc_codec_enable_clock_block(struct snd_soc_codec *codec, 
	} else {

	} else {

		snd_soc_update_bits(codec,

		snd_soc_update_bits(codec,

			MSM89XX_PMIC_DIGITAL_CDC_TOP_CLK_CTL, 0x0C, 0x00);

			MSM89XX_PMIC_DIGITAL_CDC_TOP_CLK_CTL, 0x0C, 0x00);

		msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_CLK_OFF);

	}

	}

	return 0;

	return 0;

}

}
@@ -3498,18 +3497,24 @@ static const struct snd_soc_dapm_widget msm_anlg_cdc_dapm_widgets[] = { 
	SND_SOC_DAPM_INPUT("AMIC1"),

	SND_SOC_DAPM_INPUT("AMIC1"),

	SND_SOC_DAPM_INPUT("AMIC2"),

	SND_SOC_DAPM_INPUT("AMIC2"),

	SND_SOC_DAPM_INPUT("AMIC3"),

	SND_SOC_DAPM_INPUT("AMIC3"),

	SND_SOC_DAPM_INPUT("PDM_IN_RX1"),

	SND_SOC_DAPM_AIF_IN("PDM_IN_RX1", "PDM Playback",

	SND_SOC_DAPM_INPUT("PDM_IN_RX2"),

		0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_INPUT("PDM_IN_RX3"),

	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("EAR"),

	SND_SOC_DAPM_OUTPUT("WSA_SPK OUT"),

	SND_SOC_DAPM_OUTPUT("WSA_SPK OUT"),

	SND_SOC_DAPM_OUTPUT("HEADPHONE"),

	SND_SOC_DAPM_OUTPUT("HEADPHONE"),

	SND_SOC_DAPM_OUTPUT("SPK_OUT"),

	SND_SOC_DAPM_OUTPUT("SPK_OUT"),

	SND_SOC_DAPM_OUTPUT("LINEOUT"),

	SND_SOC_DAPM_OUTPUT("LINEOUT"),

	SND_SOC_DAPM_OUTPUT("ADC1_OUT"),

	SND_SOC_DAPM_AIF_OUT("ADC1_OUT", "PDM Capture",

	SND_SOC_DAPM_OUTPUT("ADC2_OUT"),

		0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_OUTPUT("ADC3_OUT"),

	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[] = {

static const struct sdm660_cdc_reg_mask_val msm_anlg_cdc_reg_defaults[] = {