diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2020-01-14 16:18:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-17 15:28:31 +0000 |
| commit | 8ab6ddc5c51b09630f3c89eb410ac48e13a2f0ff (patch) | |
| tree | 2c9364fea741659b2aa4dc72e6a4b794dd9b0532 /sound/soc/codecs/madera.h | |
| parent | 73ecf1a673d3502dff1445f06675aba65ff20ce7 (diff) | |
| download | linux-stable-8ab6ddc5c51b09630f3c89eb410ac48e13a2f0ff.tar.gz linux-stable-8ab6ddc5c51b09630f3c89eb410ac48e13a2f0ff.tar.bz2 linux-stable-8ab6ddc5c51b09630f3c89eb410ac48e13a2f0ff.zip | |
ASoC: madera: Update handling of DAPM routes for mono muxed outputs
Correctly link both channels on the DAC if an output muxed between a
stereo and mono output. Without this one channel of the DAC may be
erroneously powered down whilst in mono mode.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200114161841.451-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/madera.h')
| -rw-r--r-- | sound/soc/codecs/madera.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h index 6d8938a3fb64..bff084695961 100644 --- a/sound/soc/codecs/madera.h +++ b/sound/soc/codecs/madera.h @@ -421,7 +421,9 @@ int madera_core_free(struct madera_priv *priv); int madera_init_overheat(struct madera_priv *priv); int madera_free_overheat(struct madera_priv *priv); int madera_init_inputs(struct snd_soc_component *component); -int madera_init_outputs(struct snd_soc_component *component, int n_mono_routes); +int madera_init_outputs(struct snd_soc_component *component, + const struct snd_soc_dapm_route *routes, + int n_mono_routes, int n_real); int madera_init_bus_error_irq(struct madera_priv *priv, int dsp_num, irq_handler_t handler); void madera_free_bus_error_irq(struct madera_priv *priv, int dsp_num); |