diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-23 15:36:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-23 15:36:42 +0300 |
| commit | 20230620b44510ce968a719a1d6ee7483583178d (patch) | |
| tree | d64130534a7dd7a4616785b5fda1f85d13cd5f8f /sound/soc/codecs/cs47l85.c | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
| parent | 8ce1cbd6ce0b1bda0c980c64fee4c1e1378355f1 (diff) | |
| download | linux-20230620b44510ce968a719a1d6ee7483583178d.tar.xz | |
Merge branch 'asoc-5.5' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/cs47l85.c')
| -rw-r--r-- | sound/soc/codecs/cs47l85.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 32fe7ffb7526..33ecff45bd6e 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -2005,12 +2005,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"), @@ -2507,7 +2513,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; |