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

Commit 5567d8c6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8994: Convert to use DAI widget routing rather than streams 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent fe360685

sound/soc/codecs/wm8994.c

+14 −6
Original line number Diff line number Diff line
@@ -1473,17 +1473,17 @@ SND_SOC_DAPM_AIF_IN_E("AIF2DACR", NULL, 0, 
		      WM8994_POWER_MANAGEMENT_5, 12, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),



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_AIF_IN("AIF1DACDAT", NULL, 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_IN("AIF2DACDAT", NULL, 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADCDAT", NULL, 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF2ADCDAT",  NULL, 0, SND_SOC_NOPM, 0, 0),



SND_SOC_DAPM_MUX("AIF1DAC Mux", SND_SOC_NOPM, 0, 0, &aif1dac_mux),

SND_SOC_DAPM_MUX("AIF2DAC Mux", SND_SOC_NOPM, 0, 0, &aif2dac_mux),

SND_SOC_DAPM_MUX("AIF2ADC Mux", SND_SOC_NOPM, 0, 0, &aif2adc_mux),



SND_SOC_DAPM_AIF_IN("AIF3DACDAT", "AIF3 Playback", 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF3ADCDAT", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_IN("AIF3DACDAT", NULL, 0, SND_SOC_NOPM, 0, 0),

SND_SOC_DAPM_AIF_OUT("AIF3ADCDAT", NULL, 0, SND_SOC_NOPM, 0, 0),



SND_SOC_DAPM_SUPPLY("TOCLK", WM8994_CLOCKING_1, 4, 0, NULL, 0),
@@ -1598,6 +1598,14 @@ static const struct snd_soc_dapm_route intercon[] = { 


	{ "TOCLK", NULL, "CLK_SYS" },



	{ "AIF1DACDAT", NULL, "AIF1 Playback" },

	{ "AIF2DACDAT", NULL, "AIF2 Playback" },

	{ "AIF3DACDAT", NULL, "AIF3 Playback" },



	{ "AIF1 Capture", NULL, "AIF1ADCDAT" },

	{ "AIF2 Capture", NULL, "AIF2ADCDAT" },

	{ "AIF3 Capture", NULL, "AIF3ADCDAT" },



	/* AIF1 outputs */

	{ "AIF1ADC1L", NULL, "AIF1ADC1L Mixer" },

	{ "AIF1ADC1L Mixer", "ADC/DMIC Switch", "ADCL Mux" },