Skip to contentSkip to conversation

ASoC: arizona: Add widget<->mux route into mux route macro

PATCH Applied Charles Keepax 2 participants 2 messages Aug 12, 2013

Subsystems (3)
Sound ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Charles Keepax

author
#0 lore raw

PATCH 1/1 ASoC: arizona: Add widget<->mux route into mux route macro

The routes linking the widget and the input mux were being added manually, rather than by the ARIZONA_MUX_ROUTES macro. This patchs adds the routes to the macro.

Signed-off-by Charles Keepax <[email protected]>
---
 sound/soc/codecs/arizona.h |    3 ++-
 sound/soc/codecs/wm5102.c  |   41 ++++++++++++-----------------------------
 sound/soc/codecs/wm5110.c  |    8 ++++----
 3 files changed, 18 insertions(+), 34 deletions(-)
sound/soc/codecs/arizona.h +2 -1
index b60b08c..bf67d65 100644
@@ -150,7 +150,8 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 	ARIZONA_MUX(name_str " Aux 5", &name##_aux5_mux), \
 	ARIZONA_MUX(name_str " Aux 6", &name##_aux6_mux)
 
-#define ARIZONA_MUX_ROUTES(name) \
+#define ARIZONA_MUX_ROUTES(widget, name) \
+	{ widget, NULL, name " Input" }, \
 	ARIZONA_MIXER_INPUT_ROUTES(name " Input")
 
 #define ARIZONA_MIXER_ROUTES(widget, name) \
sound/soc/codecs/wm5102.c +12 -29

57 lines not on this page · raw message

sound/soc/codecs/wm5110.c +4 -4
index 2e7cb4b..0cfc5e6 100644
@@ -979,10 +979,10 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
 	ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"),
 	ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"),
 
-	ARIZONA_MUX_ROUTES("ASRC1L"),
-	ARIZONA_MUX_ROUTES("ASRC1R"),
-	ARIZONA_MUX_ROUTES("ASRC2L"),
-	ARIZONA_MUX_ROUTES("ASRC2R"),
+	ARIZONA_MUX_ROUTES("ASRC1L", "ASRC1L"),
+	ARIZONA_MUX_ROUTES("ASRC1R", "ASRC1R"),
+	ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"),
+	ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"),
 
 	{ "HPOUT1L", NULL, "OUT1L" },
 	{ "HPOUT1R", NULL, "OUT1R" },
Signature · 1 line
1.7.2.5
maintainer Applied
#1 lore raw
Quoted 3 lines · Charles Keepax

The routes linking the widget and the input mux were being added manually, rather than by the ARIZONA_MUX_ROUTES macro. This patchs adds the routes to the macro.

Applied, thanks. You probably don't need to directly CC Takashi and Jaroslav on every ASoC patch...