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

Commit 69d28557 authored by SoumyaManagoli's avatar SoumyaManagoli Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: wcd9320: set gain after IIR clock is enabled 



Gain controller requires an active clock in order
to programme the gain value.
Register a post power up callback handler with
IIR1 clock and re-apply the IIR1 gain register
value in the callback handler.

Change-Id: Idb0640c411b577662cb56fd5e175f6d08c717920
Signed-off-by: default avatarSoumyaManagoli <smanag@codeaurora.org>
parent 5742c327

sound/soc/codecs/wcd9320.c

+21 −1
Original line number Diff line number Diff line
@@ -5691,6 +5691,24 @@ static int taiko_codec_enable_anc_ear(struct snd_soc_dapm_widget *w, 
	return ret;

}



static int taiko_codec_set_iir_gain(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	int value = 0;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		value = snd_soc_read(codec, TAIKO_A_CDC_IIR1_GAIN_B1_CTL);

		snd_soc_write(codec, TAIKO_A_CDC_IIR1_GAIN_B1_CTL, value);

		break;

	default:

		pr_info("%s: event = %d not expected\n", __func__, event);

		break;

	}

	return 0;

}



/* Todo: Have seperate dapm widgets for I2S and Slimbus.

 * Might Need to have callbacks registered only for slimbus

 */
@@ -6138,6 +6156,9 @@ static const struct snd_soc_dapm_widget taiko_dapm_widgets[] = { 
		&iir1_inp1_mux,  taiko_codec_iir_mux_event,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_PGA_E("IIR1", TAIKO_A_CDC_CLK_SD_CTL, 0, 0, NULL, 0,

		taiko_codec_set_iir_gain, SND_SOC_DAPM_POST_PMU),



	SND_SOC_DAPM_MUX_E("IIR1 INP2 MUX", TAIKO_A_CDC_IIR1_GAIN_B2_CTL, 0, 0,

		&iir1_inp2_mux,  taiko_codec_iir_mux_event,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -6150,7 +6171,6 @@ static const struct snd_soc_dapm_widget taiko_dapm_widgets[] = { 
		&iir1_inp4_mux,  taiko_codec_iir_mux_event,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_MIXER("IIR1", TAIKO_A_CDC_CLK_SD_CTL, 0, 0, NULL, 0),



	SND_SOC_DAPM_MUX_E("IIR2 INP1 MUX", TAIKO_A_CDC_IIR2_GAIN_B1_CTL, 0, 0,

		&iir2_inp1_mux,  taiko_codec_iir_mux_event,