linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC PATCH 1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing
@ 2020-09-25  8:34 Richard Fitzgerald
  2020-09-25  8:34 ` [RFC PATCH 2/2] ASoC: cs47l35: " Richard Fitzgerald
  2020-09-25  9:13 ` [RFC PATCH 1/2] ASoC: cs47l15: " Richard Fitzgerald
  0 siblings, 2 replies; 3+ messages in thread
From: Richard Fitzgerald @ 2020-09-25  8:34 UTC (permalink / raw)
  To: broonie; +Cc: patches, linux-kernel, alsa-devel, Richard Fitzgerald

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)
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [RFC PATCH 2/2] ASoC: cs47l35: Fix EPOUT->HPOUT1 Mono Mux routing
  2020-09-25  8:34 [RFC PATCH 1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing Richard Fitzgerald
@ 2020-09-25  8:34 ` Richard Fitzgerald
  2020-09-25  9:13 ` [RFC PATCH 1/2] ASoC: cs47l15: " Richard Fitzgerald
  1 sibling, 0 replies; 3+ messages in thread
From: Richard Fitzgerald @ 2020-09-25  8:34 UTC (permalink / raw)
  To: broonie; +Cc: patches, linux-kernel, alsa-devel, Richard Fitzgerald

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/cs47l35.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c
index 7f5dd01f40c9..e967609da8a3 100644
--- a/sound/soc/codecs/cs47l35.c
+++ b/sound/soc/codecs/cs47l35.c
@@ -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)
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [RFC PATCH 1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing
  2020-09-25  8:34 [RFC PATCH 1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing Richard Fitzgerald
  2020-09-25  8:34 ` [RFC PATCH 2/2] ASoC: cs47l35: " Richard Fitzgerald
@ 2020-09-25  9:13 ` Richard Fitzgerald
  1 sibling, 0 replies; 3+ messages in thread
From: Richard Fitzgerald @ 2020-09-25  9:13 UTC (permalink / raw)
  To: broonie; +Cc: patches, linux-kernel, alsa-devel

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)

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-25  9:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25  8:34 [RFC PATCH 1/2] ASoC: cs47l15: Fix EPOUT->HPOUT1 Mono Mux routing Richard Fitzgerald
2020-09-25  8:34 ` [RFC PATCH 2/2] ASoC: cs47l35: " Richard Fitzgerald
2020-09-25  9:13 ` [RFC PATCH 1/2] ASoC: cs47l15: " Richard Fitzgerald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).