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 <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index b6b6d70..9e81b63 100644 (file)
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -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) \

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index a6cbdb4..f38c52d 100644 (file)
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1501,23 +1501,6 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
        { "IN3L PGA", NULL, "IN3L" },
        { "IN3R PGA", NULL, "IN3R" },
 
-       { "ASRC1L", NULL, "ASRC1L Input" },
-       { "ASRC1R", NULL, "ASRC1R Input" },
-       { "ASRC2L", NULL, "ASRC2L Input" },
-       { "ASRC2R", NULL, "ASRC2R Input" },
-
-       { "ISRC1DEC1", NULL, "ISRC1DEC1 Input" },
-       { "ISRC1DEC2", NULL, "ISRC1DEC2 Input" },
-
-       { "ISRC1INT1", NULL, "ISRC1INT1 Input" },
-       { "ISRC1INT2", NULL, "ISRC1INT2 Input" },
-
-       { "ISRC2DEC1", NULL, "ISRC2DEC1 Input" },
-       { "ISRC2DEC2", NULL, "ISRC2DEC2 Input" },
-
-       { "ISRC2INT1", NULL, "ISRC2INT1 Input" },
-       { "ISRC2INT2", NULL, "ISRC2INT2 Input" },
-
        ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
        ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),
        ARIZONA_MIXER_ROUTES("OUT2L", "HPOUT2L"),
@@ -1569,22 +1552,22 @@ static const struct snd_soc_dapm_route wm5102_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"),
 
-       ARIZONA_MUX_ROUTES("ISRC1INT1"),
-       ARIZONA_MUX_ROUTES("ISRC1INT2"),
+       ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"),
+       ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC1INT2"),
 
-       ARIZONA_MUX_ROUTES("ISRC1DEC1"),
-       ARIZONA_MUX_ROUTES("ISRC1DEC2"),
+       ARIZONA_MUX_ROUTES("ISRC1DEC1", "ISRC1DEC1"),
+       ARIZONA_MUX_ROUTES("ISRC1DEC2", "ISRC1DEC2"),
 
-       ARIZONA_MUX_ROUTES("ISRC2INT1"),
-       ARIZONA_MUX_ROUTES("ISRC2INT2"),
+       ARIZONA_MUX_ROUTES("ISRC2INT1", "ISRC2INT1"),
+       ARIZONA_MUX_ROUTES("ISRC2INT2", "ISRC2INT2"),
 
-       ARIZONA_MUX_ROUTES("ISRC2DEC1"),
-       ARIZONA_MUX_ROUTES("ISRC2DEC2"),
+       ARIZONA_MUX_ROUTES("ISRC2DEC1", "ISRC2DEC1"),
+       ARIZONA_MUX_ROUTES("ISRC2DEC2", "ISRC2DEC2"),
 
        ARIZONA_DSP_ROUTES("DSP1"),
 

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 77fd531..38e50c8 100644 (file)
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -978,10 +978,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" },