From 324b4956566ce97bb070fea7e431117e8fe81a52 Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Tue, 11 Jun 2019 04:14:51 +0530 Subject: [PATCH] ASoC: bolero: Remove unused audio map routings in bolero Remove unused audio map routing from bolero codec to avoid index mismatch for mic path enablement. Change-Id: I09365f54ac5906df9568c78db902000a2dd790eb Signed-off-by: Sudheer Papothi --- asoc/codecs/bolero/tx-macro.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c index bb3f9c6a26af..4e0d3a7fb63e 100644 --- a/asoc/codecs/bolero/tx-macro.c +++ b/asoc/codecs/bolero/tx-macro.c @@ -979,9 +979,9 @@ TX_MACRO_DAPM_ENUM_EXT(tx_dmic7, BOLERO_CDC_TX_INP_MUX_ADC_MUX7_CFG0, tx_macro_put_dec_enum); static const char * const smic_mux_text[] = { - "ZERO", "ADC0", "ADC1", "ADC2", "ADC3", "ADC4", - "SWR_DMIC0", "SWR_DMIC1", "SWR_DMIC2", "SWR_DMIC3", - "SWR_DMIC4", "SWR_DMIC5", "SWR_DMIC6", "SWR_DMIC7" + "ZERO", "ADC0", "ADC1", "ADC2", "ADC3", "SWR_DMIC0", + "SWR_DMIC1", "SWR_DMIC2", "SWR_DMIC3", "SWR_DMIC4", + "SWR_DMIC5", "SWR_DMIC6", "SWR_DMIC7" }; TX_MACRO_DAPM_ENUM_EXT(tx_smic0, BOLERO_CDC_TX_INP_MUX_ADC_MUX0_CFG0, @@ -1125,7 +1125,6 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets[] = { SND_SOC_DAPM_INPUT("TX SWR_ADC1"), SND_SOC_DAPM_INPUT("TX SWR_ADC2"), SND_SOC_DAPM_INPUT("TX SWR_ADC3"), - SND_SOC_DAPM_INPUT("TX SWR_ADC4"), SND_SOC_DAPM_INPUT("TX SWR_DMIC0"), SND_SOC_DAPM_INPUT("TX SWR_DMIC1"), SND_SOC_DAPM_INPUT("TX SWR_DMIC2"), @@ -1245,7 +1244,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX0", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX0", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX0", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX0", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX0", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX0", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX0", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1271,7 +1269,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX1", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX1", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX1", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX1", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX1", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX1", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX1", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1297,7 +1294,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX2", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX2", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX2", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX2", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX2", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX2", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX2", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1323,7 +1319,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX3", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX3", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX3", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX3", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX3", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX3", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX3", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1349,7 +1344,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX4", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX4", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX4", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX4", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX4", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX4", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX4", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1375,7 +1369,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX5", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX5", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX5", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX5", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX5", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX5", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX5", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1401,7 +1394,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX6", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX6", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX6", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX6", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX6", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX6", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX6", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1427,7 +1419,6 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX7", "ADC1", "TX SWR_ADC1"}, {"TX SMIC MUX7", "ADC2", "TX SWR_ADC2"}, {"TX SMIC MUX7", "ADC3", "TX SWR_ADC3"}, - {"TX SMIC MUX7", "ADC4", "TX SWR_ADC4"}, {"TX SMIC MUX7", "SWR_DMIC0", "TX SWR_DMIC0"}, {"TX SMIC MUX7", "SWR_DMIC1", "TX SWR_DMIC1"}, {"TX SMIC MUX7", "SWR_DMIC2", "TX SWR_DMIC2"}, @@ -1764,7 +1755,6 @@ static int tx_macro_init(struct snd_soc_component *component) snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC1"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC2"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC3"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC4"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC0"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC1"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC2");