Skip to contentSkip to conversation

ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing

RFC PATCH In review Richard Fitzgerald 1 participant 3 messages Sep 25, 2020

Subsystems (4)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

RFC PATCH 1/2 ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing

EPOUT is always mono so should have a permanent routing through the HPOUT1 Mono Mux.

---
 sound/soc/codecs/cs47l15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs47l15.c +1 -1
index a591e7457d11..254f9d96e766 100644
@@ -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)
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

RFC PATCH 2/2 ASoC: cs47l35: Fix EPOUT->HPOUT1 Mono Mux routing

EPOUT is always mono so should have a permanent routing through the HPOUT1 Mono Mux.

---
 sound/soc/codecs/cs47l35.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs47l35.c +1 -1
index 7f5dd01f40c9..e967609da8a3 100644
@@ -1305,6 +1305,7 @@ static const struct snd_soc_dapm_route cs47l35_dapm_routes[] = {
 	{ "SPKOUTP", NULL, "OUT4L" },
 
 	{ "OUT1R", NULL, "HPOUT1 Mono Mux" },
+	{ "HPOUT1 Mono Mux", "EPOUT", "OUT1L" },
 
 	{ "HPOUTL", "HPOUT", "HPOUT1 Demux" },
 	{ "HPOUTR", "HPOUT", "HPOUT1 Demux" },
@@ -1550,7 +1551,6 @@ static irqreturn_t cs47l35_adsp2_irq(int irq, void *data)
 
 static const struct snd_soc_dapm_route cs47l35_mono_routes[] = {
 	{ "HPOUT1 Mono Mux", "HPOUT", "OUT1L" },
-	{ "HPOUT1 Mono Mux", "EPOUT", "OUT1L" },
 };
 
 static int cs47l35_component_probe(struct snd_soc_component *component)
Signature · 1 line
2.20.1
author maintainer
#2 lore raw
In reply to Richard Fitzgerald

Sorry. Left a stray "RFC" on the email title. I'm going to kick myself and then re-send.

Quoted 28 lines · Richard Fitzgerald

EPOUT is always mono so should have a permanent routing through the HPOUT1 Mono Mux.

---
  sound/soc/codecs/cs47l15.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs47l15.c +1 -1
index a591e7457d11..254f9d96e766 100644
@@ -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)