Commit a30c188b authored Jan 13, 2015 by Bo Shen Committed by Mark Brown Jan 14, 2015

ASoC: wm8904: fix runtime warning



Correct the path name for mux to get rid of the following warning:

--->8---
wm8904 1-001a: Control not supported for path ADCL -> [Left] -> AIFOUTL
wm8904 1-001a: ASoC: no dapm match for ADCL --> Left --> AIFOUTL
wm8904 1-001a: ASoC: Failed to add route ADCL -> Left -> AIFOUTL
wm8904 1-001a: Control not supported for path ADCR -> [Right] -> AIFOUTL
wm8904 1-001a: ASoC: no dapm match for ADCR --> Right --> AIFOUTL
wm8904 1-001a: ASoC: Failed to add route ADCR -> Right -> AIFOUTL
wm8904 1-001a: Control not supported for path ADCL -> [Left] -> AIFOUTR
wm8904 1-001a: ASoC: no dapm match for ADCL --> Left --> AIFOUTR
wm8904 1-001a: ASoC: Failed to add route ADCL -> Left -> AIFOUTR
wm8904 1-001a: Control not supported for path ADCR -> [Right] -> AIFOUTR
wm8904 1-001a: ASoC: no dapm match for ADCR --> Right --> AIFOUTR
wm8904 1-001a: ASoC: Failed to add route ADCR -> Right -> AIFOUTR
wm8904 1-001a: Control not supported for path AIFINR -> [Right] -> DACL
wm8904 1-001a: ASoC: no dapm match for AIFINR --> Right --> DACL
wm8904 1-001a: ASoC: Failed to add route AIFINR -> Right -> DACL
wm8904 1-001a: Control not supported for path AIFINL -> [Left] -> DACL
wm8904 1-001a: ASoC: no dapm match for AIFINL --> Left --> DACL
wm8904 1-001a: ASoC: Failed to add route AIFINL -> Left -> DACL
wm8904 1-001a: Control not supported for path AIFINR -> [Right] -> DACR
wm8904 1-001a: ASoC: no dapm match for AIFINR --> Right --> DACR
wm8904 1-001a: ASoC: Failed to add route AIFINR -> Right -> DACR
wm8904 1-001a: Control not supported for path AIFINL -> [Left] -> DACR
wm8904 1-001a: ASoC: no dapm match for AIFINL --> Left --> DACR
wm8904 1-001a: ASoC: Failed to add route AIFINL -> Left -> DACR
---8<---

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 97bf6af1

sound/soc/codecs/wm8904.c

+15 −8

Original line number	Diff line number	Diff line
		@@ -1076,10 +1076,13 @@ static const struct snd_soc_dapm_route adc_intercon[] = {
		{ "Right Capture PGA", NULL, "Right Capture Mux" },
		{ "Right Capture PGA", NULL, "Right Capture Inverting Mux" },

		{ "AIFOUTL", "Left", "ADCL" },
		{ "AIFOUTL", "Right", "ADCR" },
		{ "AIFOUTR", "Left", "ADCL" },
		{ "AIFOUTR", "Right", "ADCR" },
		{ "AIFOUTL Mux", "Left", "ADCL" },
		{ "AIFOUTL Mux", "Right", "ADCR" },
		{ "AIFOUTR Mux", "Left", "ADCL" },
		{ "AIFOUTR Mux", "Right", "ADCR" },

		{ "AIFOUTL", NULL, "AIFOUTL Mux" },
		{ "AIFOUTR", NULL, "AIFOUTR Mux" },

		{ "ADCL", NULL, "CLK_DSP" },
		{ "ADCL", NULL, "Left Capture PGA" },
		@@ -1089,12 +1092,16 @@ static const struct snd_soc_dapm_route adc_intercon[] = {
		};

		static const struct snd_soc_dapm_route dac_intercon[] = {
		{ "DACL", "Right", "AIFINR" },
		{ "DACL", "Left", "AIFINL" },
		{ "DACL Mux", "Left", "AIFINL" },
		{ "DACL Mux", "Right", "AIFINR" },

		{ "DACR Mux", "Left", "AIFINL" },
		{ "DACR Mux", "Right", "AIFINR" },

		{ "DACL", NULL, "DACL Mux" },
		{ "DACL", NULL, "CLK_DSP" },

		{ "DACR", "Right", "AIFINR" },
		{ "DACR", "Left", "AIFINL" },
		{ "DACR", NULL, "DACR Mux" },
		{ "DACR", NULL, "CLK_DSP" },

		{ "Charge pump", NULL, "SYSCLK" },

Admin message