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

Commit 31200b96 authored by Kiran Kandi's avatar Kiran Kandi Committed by Stephen Boyd
Browse files

ASoC: wcd9320: Add routes from slimbus ports to IIR 



Taiko codec has two IIR blocks. Add audio routes from Slimbus
ports to IIR blocks.

CRs-Fixed: 482295
Change-Id: I833ac4860507f6f0ef93d77d6e894baa2c69e629
Signed-off-by: default avatarKiran Kandi <kkandi@codeaurora.org>
parent 1e343748

sound/soc/codecs/wcd9320.c

+19 −3
Original line number Diff line number Diff line
@@ -3785,13 +3785,15 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"RX7 MIX1 INP2", "RX6", "SLIM RX6"},

	{"RX7 MIX1 INP2", "RX7", "SLIM RX7"},

	{"RX7 MIX1 INP2", "IIR1", "IIR1"},

	{"RX7 MIX1 INP2", "IIR2", "IIR2"},



	/* IIR1, IIR2 inputs to Second RX Mixer on RX1, RX2 and RX7 chains. */

	{"RX1 MIX2 INP1", "IIR1", "IIR1"},

	{"RX1 MIX2 INP2", "IIR1", "IIR1"},

	{"RX2 MIX2 INP1", "IIR1", "IIR1"},

	{"RX2 MIX2 INP2", "IIR1", "IIR1"},

	{"RX7 MIX2 INP1", "IIR1", "IIR1"},

	{"RX7 MIX2 INP2", "IIR1", "IIR1"},

	{"RX7 MIX1 INP2", "IIR2", "IIR2"},

	{"RX1 MIX2 INP1", "IIR2", "IIR2"},

	{"RX1 MIX2 INP2", "IIR2", "IIR2"},

	{"RX2 MIX2 INP1", "IIR2", "IIR2"},
@@ -3869,6 +3871,13 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"IIR1 INP1 MUX", "DEC8", "DEC8 MUX"},

	{"IIR1 INP1 MUX", "DEC9", "DEC9 MUX"},

	{"IIR1 INP1 MUX", "DEC10", "DEC10 MUX"},

	{"IIR1 INP1 MUX", "RX1", "SLIM RX1"},

	{"IIR1 INP1 MUX", "RX2", "SLIM RX2"},

	{"IIR1 INP1 MUX", "RX3", "SLIM RX3"},

	{"IIR1 INP1 MUX", "RX4", "SLIM RX4"},

	{"IIR1 INP1 MUX", "RX5", "SLIM RX5"},

	{"IIR1 INP1 MUX", "RX6", "SLIM RX6"},

	{"IIR1 INP1 MUX", "RX7", "SLIM RX7"},



	{"IIR2", NULL, "IIR2 INP1 MUX"},

	{"IIR2 INP1 MUX", "DEC1", "DEC1 MUX"},
@@ -3881,6 +3890,13 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"IIR2 INP1 MUX", "DEC8", "DEC8 MUX"},

	{"IIR2 INP1 MUX", "DEC9", "DEC9 MUX"},

	{"IIR2 INP1 MUX", "DEC10", "DEC10 MUX"},

	{"IIR2 INP1 MUX", "RX1", "SLIM RX1"},

	{"IIR2 INP1 MUX", "RX2", "SLIM RX2"},

	{"IIR2 INP1 MUX", "RX3", "SLIM RX3"},

	{"IIR2 INP1 MUX", "RX4", "SLIM RX4"},

	{"IIR2 INP1 MUX", "RX5", "SLIM RX5"},

	{"IIR2 INP1 MUX", "RX6", "SLIM RX6"},

	{"IIR2 INP1 MUX", "RX7", "SLIM RX7"},



	{"MIC BIAS1 Internal1", NULL, "LDO_H"},

	{"MIC BIAS1 Internal2", NULL, "LDO_H"},
@@ -5478,10 +5494,10 @@ static const struct snd_soc_dapm_widget taiko_dapm_widgets[] = { 


	/* Sidetone */

	SND_SOC_DAPM_MUX("IIR1 INP1 MUX", SND_SOC_NOPM, 0, 0, &iir1_inp1_mux),

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

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



	SND_SOC_DAPM_MUX("IIR2 INP1 MUX", SND_SOC_NOPM, 0, 0, &iir2_inp1_mux),

	SND_SOC_DAPM_PGA("IIR2", TAIKO_A_CDC_CLK_SD_CTL, 1, 0, NULL, 0),

	SND_SOC_DAPM_MIXER("IIR2", TAIKO_A_CDC_CLK_SD_CTL, 1, 0, NULL, 0),



	/* AUX PGA */

	SND_SOC_DAPM_ADC_E("AUX_PGA_Left", NULL, TAIKO_A_RX_AUX_SW_CTL, 7, 0,