Merge branch 'asoc-5.6' into asoc-next

[linux-2.6-microblaze.git] / sound / soc / codecs / cs47l85.c

diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c
index f85581a..bef3471 100644 (file)
--- a/sound/soc/codecs/cs47l85.c
+++ b/sound/soc/codecs/cs47l85.c
@@ -2008,12 +2008,18 @@ static const struct snd_soc_dapm_route cs47l85_dapm_routes[] = {
        { "IN3R", NULL, "IN3R Mode" },
 
        { "IN4L", NULL, "DMICCLK4" },
+       { "IN4L", NULL, "DMICDAT4" },
+       { "IN4R", NULL, "DMICCLK4" },
        { "IN4R", NULL, "DMICDAT4" },
 
        { "IN5L", NULL, "DMICCLK5" },
+       { "IN5L", NULL, "DMICDAT5" },
+       { "IN5R", NULL, "DMICCLK5" },
        { "IN5R", NULL, "DMICDAT5" },
 
        { "IN6L", NULL, "DMICCLK6" },
+       { "IN6L", NULL, "DMICDAT6" },
+       { "IN6R", NULL, "DMICCLK6" },
        { "IN6R", NULL, "DMICDAT6" },
 
        MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
@@ -2510,7 +2516,8 @@ static int cs47l85_component_probe(struct snd_soc_component *component)
        if (ret)
                return ret;
 
-       ret = madera_init_outputs(component, CS47L85_MONO_OUTPUTS);
+       ret = madera_init_outputs(component, NULL, CS47L85_MONO_OUTPUTS,
+                                 CS47L85_MONO_OUTPUTS);
        if (ret)
                return ret;