* [PATCH] ASoC: cs42l51: add dac mux widget in codec routes
@ 2019-12-03 14:16 Olivier Moysan
2019-12-03 14:39 ` Mark Brown
2019-12-09 18:59 ` Applied "ASoC: cs42l51: add dac mux widget in codec routes" to the asoc tree Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Olivier Moysan @ 2019-12-03 14:16 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, mcoquelin.stm32,
alexandre.torgue, alsa-devel, linux-arm-kernel, linux-stm32,
linux-kernel, olivier.moysan
Cc: apatard
Add "DAC mux" DAPM widget in CS42l51 audio codec routes,
to support DAC mux control and to remove error trace
"DAC Mux has no paths" at widget creation.
Note: ADC path of DAC mux is not routed in this patch.
Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
---
sound/soc/codecs/cs42l51.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 55408c8fcb4e..e47758e4fb36 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -214,12 +214,10 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = {
SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture",
CS42L51_POWER_CTL1, 2, 1,
cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
- SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback",
- CS42L51_POWER_CTL1, 5, 1,
- cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
- SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",
- CS42L51_POWER_CTL1, 6, 1,
- cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
+ SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1,
+ cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
+ SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1,
+ cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
/* analog/mic */
SND_SOC_DAPM_INPUT("AIN1L"),
@@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = {
{"HPL", NULL, "Left DAC"},
{"HPR", NULL, "Right DAC"},
+ {"Right DAC", NULL, "DAC Mux"},
+ {"Left DAC", NULL, "DAC Mux"},
+
+ {"DAC Mux", "Direct PCM", "Playback"},
+ {"DAC Mux", "DSP PCM", "Playback"},
+
{"Left ADC", NULL, "Left PGA"},
{"Right ADC", NULL, "Right PGA"},
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ASoC: cs42l51: add dac mux widget in codec routes
2019-12-03 14:16 [PATCH] ASoC: cs42l51: add dac mux widget in codec routes Olivier Moysan
@ 2019-12-03 14:39 ` Mark Brown
2019-12-03 15:07 ` Olivier MOYSAN
2019-12-09 18:59 ` Applied "ASoC: cs42l51: add dac mux widget in codec routes" to the asoc tree Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2019-12-03 14:39 UTC (permalink / raw)
To: Olivier Moysan
Cc: alsa-devel, alexandre.torgue, linux-kernel, tiwai, lgirdwood,
mcoquelin.stm32, apatard, perex, linux-stm32, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 643 bytes --]
On Tue, Dec 03, 2019 at 03:16:27PM +0100, Olivier Moysan wrote:
> - SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback",
> - CS42L51_POWER_CTL1, 5, 1,
> - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
> - SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",
> - CS42L51_POWER_CTL1, 6, 1,
> - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
> + SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1,
> + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
> + SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1,
> + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
This looks like an unrelated formatting change?
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ASoC: cs42l51: add dac mux widget in codec routes
2019-12-03 14:39 ` Mark Brown
@ 2019-12-03 15:07 ` Olivier MOYSAN
0 siblings, 0 replies; 4+ messages in thread
From: Olivier MOYSAN @ 2019-12-03 15:07 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Alexandre TORGUE, linux-kernel, tiwai, lgirdwood,
mcoquelin.stm32, apatard, perex, linux-stm32, linux-arm-kernel
Hello Mark,
On 12/3/19 3:39 PM, Mark Brown wrote:
> On Tue, Dec 03, 2019 at 03:16:27PM +0100, Olivier Moysan wrote:
>
>> - SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback",
>> - CS42L51_POWER_CTL1, 5, 1,
>> - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
>> - SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",
>> - CS42L51_POWER_CTL1, 6, 1,
>> - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
>> + SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1,
>> + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
>> + SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1,
>> + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
> This looks like an unrelated formatting change?
The reason of this change is to replace "HiFi Playback" by NULL, in
order to connect
DAC widget to DAC mux widget, instead of connecting it directly to Playback.
Regards
Olivier
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Applied "ASoC: cs42l51: add dac mux widget in codec routes" to the asoc tree
2019-12-03 14:16 [PATCH] ASoC: cs42l51: add dac mux widget in codec routes Olivier Moysan
2019-12-03 14:39 ` Mark Brown
@ 2019-12-09 18:59 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2019-12-09 18:59 UTC (permalink / raw)
To: Olivier Moysan
Cc: alsa-devel, olivier.moysan, alexandre.torgue, tiwai, lgirdwood,
linux-kernel, Mark Brown, mcoquelin.stm32, apatard, perex,
linux-stm32, linux-arm-kernel
The patch
ASoC: cs42l51: add dac mux widget in codec routes
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From abe3b6727b653307c27870a2d4ecbf9de4e914a5 Mon Sep 17 00:00:00 2001
From: Olivier Moysan <olivier.moysan@st.com>
Date: Tue, 3 Dec 2019 15:16:27 +0100
Subject: [PATCH] ASoC: cs42l51: add dac mux widget in codec routes
Add "DAC mux" DAPM widget in CS42l51 audio codec routes,
to support DAC mux control and to remove error trace
"DAC Mux has no paths" at widget creation.
Note: ADC path of DAC mux is not routed in this patch.
Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20191203141627.29471-1-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs42l51.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 55408c8fcb4e..e47758e4fb36 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -214,12 +214,10 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = {
SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture",
CS42L51_POWER_CTL1, 2, 1,
cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
- SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback",
- CS42L51_POWER_CTL1, 5, 1,
- cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
- SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",
- CS42L51_POWER_CTL1, 6, 1,
- cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
+ SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1,
+ cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
+ SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1,
+ cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
/* analog/mic */
SND_SOC_DAPM_INPUT("AIN1L"),
@@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = {
{"HPL", NULL, "Left DAC"},
{"HPR", NULL, "Right DAC"},
+ {"Right DAC", NULL, "DAC Mux"},
+ {"Left DAC", NULL, "DAC Mux"},
+
+ {"DAC Mux", "Direct PCM", "Playback"},
+ {"DAC Mux", "DSP PCM", "Playback"},
+
{"Left ADC", NULL, "Left PGA"},
{"Right ADC", NULL, "Right PGA"},
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-09 18:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-03 14:16 [PATCH] ASoC: cs42l51: add dac mux widget in codec routes Olivier Moysan
2019-12-03 14:39 ` Mark Brown
2019-12-03 15:07 ` Olivier MOYSAN
2019-12-09 18:59 ` Applied "ASoC: cs42l51: add dac mux widget in codec routes" to the asoc tree Mark Brown
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).