diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:42 +0000 |
| commit | 20230620b44510ce968a719a1d6ee7483583178d (patch) | |
| tree | d64130534a7dd7a4616785b5fda1f85d13cd5f8f /sound/soc/codecs/cs47l90.c | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
| parent | 8ce1cbd6ce0b1bda0c980c64fee4c1e1378355f1 (diff) | |
| download | linux-20230620b44510ce968a719a1d6ee7483583178d.tar.gz linux-20230620b44510ce968a719a1d6ee7483583178d.tar.bz2 linux-20230620b44510ce968a719a1d6ee7483583178d.zip | |
Merge branch 'asoc-5.5' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/cs47l90.c')
| -rw-r--r-- | sound/soc/codecs/cs47l90.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index 67cac60a859d..16504d26dcf2 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -1935,12 +1935,18 @@ static const struct snd_soc_dapm_route cs47l90_dapm_routes[] = { { "IN2R", NULL, "IN2R Mode" }, { "IN3L", NULL, "DMICCLK3" }, + { "IN3L", NULL, "DMICDAT3" }, + { "IN3R", NULL, "DMICCLK3" }, { "IN3R", NULL, "DMICDAT3" }, { "IN4L", NULL, "DMICCLK4" }, + { "IN4L", NULL, "DMICDAT4" }, + { "IN4R", NULL, "DMICCLK4" }, { "IN4R", NULL, "DMICDAT4" }, { "IN5L", NULL, "DMICCLK5" }, + { "IN5L", NULL, "DMICDAT5" }, + { "IN5R", NULL, "DMICCLK5" }, { "IN5R", NULL, "DMICDAT5" }, MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"), @@ -2418,7 +2424,8 @@ static int cs47l90_component_probe(struct snd_soc_component *component) if (ret) return ret; - ret = madera_init_outputs(component, CS47L90_MONO_OUTPUTS); + ret = madera_init_outputs(component, NULL, CS47L90_MONO_OUTPUTS, + CS47L90_MONO_OUTPUTS); if (ret) return ret; |