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

Commit b70a51ba authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use late enable handling for direct voice, speaker and headphone 



This ensures appropriate clocking for bypass paths to speaker and
headphone and direct voice paths on affected revisions.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 889ebae5

sound/soc/codecs/wm8993.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -876,7 +876,7 @@ SND_SOC_DAPM_MIXER("SPKL", WM8993_POWER_MANAGEMENT_3, 8, 0, 
		   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),

		   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),

SND_SOC_DAPM_MIXER("SPKR", WM8993_POWER_MANAGEMENT_3, 9, 0,

SND_SOC_DAPM_MIXER("SPKR", WM8993_POWER_MANAGEMENT_3, 9, 0,

		   right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),

		   right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),



SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),

};

};





static const struct snd_soc_dapm_route routes[] = {

static const struct snd_soc_dapm_route routes[] = {

sound/soc/codecs/wm8994.c

+21 −9
Original line number Original line Diff line number Diff line
@@ -1146,13 +1146,33 @@ SND_SOC_DAPM_PGA_E("Late DAC2L Enable PGA", SND_SOC_NOPM, 0, 0, NULL, 0, 
	late_enable_ev, SND_SOC_DAPM_PRE_PMU),

	late_enable_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_PGA_E("Late DAC2R Enable PGA", SND_SOC_NOPM, 0, 0, NULL, 0,

SND_SOC_DAPM_PGA_E("Late DAC2R Enable PGA", SND_SOC_NOPM, 0, 0, NULL, 0,

	late_enable_ev, SND_SOC_DAPM_PRE_PMU),

	late_enable_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_PGA_E("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0,

	late_enable_ev, SND_SOC_DAPM_PRE_PMU),



SND_SOC_DAPM_MIXER_E("SPKL", WM8994_POWER_MANAGEMENT_3, 8, 0,

		     left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer),

		     late_enable_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_MIXER_E("SPKR", WM8994_POWER_MANAGEMENT_3, 9, 0,

		     right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer),

		     late_enable_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_MUX_E("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux,

		   late_enable_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_MUX_E("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux,

		   late_enable_ev, SND_SOC_DAPM_PRE_PMU),





SND_SOC_DAPM_POST("Late Disable PGA", late_disable_ev)

SND_SOC_DAPM_POST("Late Disable PGA", late_disable_ev)

};

};





static const struct snd_soc_dapm_widget wm8994_lateclk_widgets[] = {

static const struct snd_soc_dapm_widget wm8994_lateclk_widgets[] = {

SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0)

SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0),

SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),

SND_SOC_DAPM_MIXER("SPKL", WM8994_POWER_MANAGEMENT_3, 8, 0,

		   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),

SND_SOC_DAPM_MIXER("SPKR", WM8994_POWER_MANAGEMENT_3, 9, 0,

		   right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),

SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),

SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),

};

};





static const struct snd_soc_dapm_widget wm8994_dac_revd_widgets[] = {

static const struct snd_soc_dapm_widget wm8994_dac_revd_widgets[] = {
@@ -1283,14 +1303,6 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0), 
SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0),

SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0),

SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),





SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),

SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),



SND_SOC_DAPM_MIXER("SPKL", WM8994_POWER_MANAGEMENT_3, 8, 0,

		   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),

SND_SOC_DAPM_MIXER("SPKR", WM8994_POWER_MANAGEMENT_3, 9, 0,

		   right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),



SND_SOC_DAPM_POST("Debug log", post_ev),

SND_SOC_DAPM_POST("Debug log", post_ev),

};

};

sound/soc/codecs/wm_hubs.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -598,9 +598,6 @@ SND_SOC_DAPM_MIXER("IN2L PGA", WM8993_POWER_MANAGEMENT_2, 7, 0, 
SND_SOC_DAPM_MIXER("IN2R PGA", WM8993_POWER_MANAGEMENT_2, 5, 0,

SND_SOC_DAPM_MIXER("IN2R PGA", WM8993_POWER_MANAGEMENT_2, 5, 0,

		   in2r_pga, ARRAY_SIZE(in2r_pga)),

		   in2r_pga, ARRAY_SIZE(in2r_pga)),





/* Dummy widgets to represent differential paths */

SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),



SND_SOC_DAPM_MIXER("MIXINL", WM8993_POWER_MANAGEMENT_2, 9, 0,

SND_SOC_DAPM_MIXER("MIXINL", WM8993_POWER_MANAGEMENT_2, 9, 0,

		   mixinl, ARRAY_SIZE(mixinl)),

		   mixinl, ARRAY_SIZE(mixinl)),

SND_SOC_DAPM_MIXER("MIXINR", WM8993_POWER_MANAGEMENT_2, 8, 0,

SND_SOC_DAPM_MIXER("MIXINR", WM8993_POWER_MANAGEMENT_2, 8, 0,