Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / arizona.h

diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 10b398477203a43be5365eab324a0cfba805a1e4..16df0f9133537569c2a84f677e4fcb23d7af1b4e 100644 (file)
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -166,20 +166,21 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
        ARIZONA_MIXER_INPUT_ROUTES(name " Input 4")
 
 #define ARIZONA_DSP_ROUTES(name) \
-       { name, NULL, name " Aux 1" }, \
-       { name, NULL, name " Aux 2" }, \
-       { name, NULL, name " Aux 3" }, \
-       { name, NULL, name " Aux 4" }, \
-       { name, NULL, name " Aux 5" }, \
-       { name, NULL, name " Aux 6" }, \
+       { name, NULL, name " Preloader"}, \
+       { name " Preloader", NULL, name " Aux 1" }, \
+       { name " Preloader", NULL, name " Aux 2" }, \
+       { name " Preloader", NULL, name " Aux 3" }, \
+       { name " Preloader", NULL, name " Aux 4" }, \
+       { name " Preloader", NULL, name " Aux 5" }, \
+       { name " Preloader", NULL, name " Aux 6" }, \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 1"), \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 2"), \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 3"), \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 4"), \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 5"), \
        ARIZONA_MIXER_INPUT_ROUTES(name " Aux 6"), \
-       ARIZONA_MIXER_ROUTES(name, name "L"), \
-       ARIZONA_MIXER_ROUTES(name, name "R")
+       ARIZONA_MIXER_ROUTES(name " Preloader", name "L"), \
+       ARIZONA_MIXER_ROUTES(name " Preloader", name "R")
 
 #define ARIZONA_RATE_ENUM_SIZE 4
 extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];