| Message ID | 20200925083410.3987-1-rf@opensource.cirrus.com |
|---|---|
| State | Accepted |
| Commit | 64952377548517a14d0a6521856dde9fd8356c90 |
| Headers | show |
| Series | [RFC,1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing | expand |
Sorry. Left a stray "RFC" on the email title. I'm going to kick myself and then re-send. On 25/09/2020 09:34, Richard Fitzgerald wrote: > EPOUT is always mono so should have a permanent routing through the > HPOUT1 Mono Mux. > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > --- > sound/soc/codecs/cs47l15.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c > index a591e7457d11..254f9d96e766 100644 > --- a/sound/soc/codecs/cs47l15.c > +++ b/sound/soc/codecs/cs47l15.c > @@ -1089,6 +1089,7 @@ static const struct snd_soc_dapm_route cs47l15_dapm_routes[] = { > { "HPOUT1 Demux", NULL, "OUT1R" }, > > { "OUT1R", NULL, "HPOUT1 Mono Mux" }, > + { "HPOUT1 Mono Mux", "EPOUT", "OUT1L" }, > > { "HPOUTL", "HPOUT", "HPOUT1 Demux" }, > { "HPOUTR", "HPOUT", "HPOUT1 Demux" }, > @@ -1268,7 +1269,6 @@ static irqreturn_t cs47l15_adsp2_irq(int irq, void *data) > > static const struct snd_soc_dapm_route cs47l15_mono_routes[] = { > { "HPOUT1 Mono Mux", "HPOUT", "OUT1L" }, > - { "HPOUT1 Mono Mux", "EPOUT", "OUT1L" }, > }; > > static int cs47l15_component_probe(struct snd_soc_component *component)
diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c index a591e7457d11..254f9d96e766 100644 --- a/sound/soc/codecs/cs47l15.c +++ b/sound/soc/codecs/cs47l15.c @@ -1089,6 +1089,7 @@ static const struct snd_soc_dapm_route cs47l15_dapm_routes[] = { { "HPOUT1 Demux", NULL, "OUT1R" }, { "OUT1R", NULL, "HPOUT1 Mono Mux" }, + { "HPOUT1 Mono Mux", "EPOUT", "OUT1L" }, { "HPOUTL", "HPOUT", "HPOUT1 Demux" }, { "HPOUTR", "HPOUT", "HPOUT1 Demux" }, @@ -1268,7 +1269,6 @@ static irqreturn_t cs47l15_adsp2_irq(int irq, void *data) static const struct snd_soc_dapm_route cs47l15_mono_routes[] = { { "HPOUT1 Mono Mux", "HPOUT", "OUT1L" }, - { "HPOUT1 Mono Mux", "EPOUT", "OUT1L" }, }; static int cs47l15_component_probe(struct snd_soc_component *component)
EPOUT is always mono so should have a permanent routing through the HPOUT1 Mono Mux. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> --- sound/soc/codecs/cs47l15.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)