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

Commit 7f94de48 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Create an AIF1ADCDAT signal widget to match AIF2 



Due to the different routing for AIF1 and AIF2 we weren't using a
single widget to represent the ADCDAT signal. For consistency add
one.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Cc: stable@kernel.org
parent f9eb9dd1

sound/soc/codecs/wm8994.c

+10 −4
Original line number Diff line number Diff line
@@ -1287,9 +1287,9 @@ SND_SOC_DAPM_SUPPLY("DSPINTCLK", WM8994_CLOCKING_1, 1, 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_AIF_OUT("AIF1ADC1L", "AIF1 Capture",

SND_SOC_DAPM_AIF_OUT("AIF1ADC1L", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 9, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", "AIF1 Capture",

SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 8, 0),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC1L", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 9, 0, wm8958_aif_ev,
@@ -1298,9 +1298,9 @@ SND_SOC_DAPM_AIF_IN_E("AIF1DAC1R", NULL, 0, 
		      WM8994_POWER_MANAGEMENT_5, 8, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



SND_SOC_DAPM_AIF_OUT("AIF1ADC2L", "AIF1 Capture",

SND_SOC_DAPM_AIF_OUT("AIF1ADC2L", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 11, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",

SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 10, 0),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC2L", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 11, 0, wm8958_aif_ev,
@@ -1345,6 +1345,7 @@ SND_SOC_DAPM_AIF_IN_E("AIF2DACR", NULL, 0, 


SND_SOC_DAPM_AIF_IN("AIF1DACDAT", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_IN("AIF2DACDAT", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADCDAT", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF2ADCDAT", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),



SND_SOC_DAPM_MUX("AIF1DAC Mux", SND_SOC_NOPM, 0, 0, &aif1dac_mux),
@@ -1546,6 +1547,11 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{ "AIF2DAC2R Mixer", "Left Sidetone Switch", "Left Sidetone" },

	{ "AIF2DAC2R Mixer", "Right Sidetone Switch", "Right Sidetone" },



	{ "AIF1ADCDAT", NULL, "AIF1ADC1L" },

	{ "AIF1ADCDAT", NULL, "AIF1ADC1R" },

	{ "AIF1ADCDAT", NULL, "AIF1ADC2L" },

	{ "AIF1ADCDAT", NULL, "AIF1ADC2R" },



	{ "AIF2ADCDAT", NULL, "AIF2ADC Mux" },



	/* AIF3 output */