* [PATCH] ASoC: wm8960: add DAC mono mix kcontrol
@ 2016-01-08 8:57 Zidan Wang
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Zidan Wang @ 2016-01-08 8:57 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, Zidan Wang, patches, tiwai, ckeepax
In normal operation, the left and right channel digital audio data is
converted to analogue in two separate DACs. There is a mono-mix mode
where the two audio channels are mixed together digitally and then
converted to analogue using only one DAC, while the other DAC is
switched off. The mono-mix signal can be selected to appear on both
analogue output channels. The mono mix is automatically attenuated by
6dB to prevent clipping.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
---
sound/soc/codecs/wm8960.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 162def8..029031b 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -153,6 +153,7 @@ static const char *wm8960_adc_data_output_sel[] = {
"Left Data = Right ADC; Right Data = Right ADC",
"Left Data = Right ADC; Right Data = Left ADC",
};
+static const char *wm8960_dmonomix[] = {"Stereo", "Mono"};
static const struct soc_enum wm8960_enum[] = {
SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity),
@@ -162,6 +163,7 @@ static const struct soc_enum wm8960_enum[] = {
SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc),
SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode),
SOC_ENUM_SINGLE(WM8960_ADDCTL1, 2, 4, wm8960_adc_data_output_sel),
+ SOC_ENUM_SINGLE(WM8960_ADDCTL1, 4, 2, wm8960_dmonomix),
};
static const int deemph_settings[] = { 0, 32000, 44100, 48000 };
@@ -304,6 +306,7 @@ SOC_SINGLE_TLV("Right Output Mixer RINPUT3 Volume",
WM8960_ROUTMIX, 4, 7, 1, bypass_tlv),
SOC_ENUM("ADC Data Output Select", wm8960_enum[6]),
+SOC_ENUM("DAC Mono Mix", wm8960_enum[7]),
};
static const struct snd_kcontrol_new wm8960_lin_boost[] = {
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1
2016-01-08 8:57 [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Zidan Wang
@ 2016-01-08 8:57 ` Zidan Wang
2016-01-08 12:36 ` Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: boost switch should be closed when using L/RINPUT1" to the asoc tree Mark Brown
2016-01-08 11:57 ` [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: add DAC mono mix kcontrol" to the asoc tree Mark Brown
2 siblings, 2 replies; 6+ messages in thread
From: Zidan Wang @ 2016-01-08 8:57 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, Zidan Wang, patches, tiwai, ckeepax
L/RINPUT1 can line to Left/Right Boost Mixer through boost switch.
If boost switch is open, there will be no voice when using L/RINPUT1.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
---
sound/soc/codecs/wm8960.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 029031b..ff23772 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -413,8 +413,8 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" },
{ "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" },
- { "Left Input Mixer", "Boost Switch", "Left Boost Mixer", },
- { "Left Input Mixer", NULL, "LINPUT1", }, /* Really Boost Switch */
+ { "Left Input Mixer", "Boost Switch", "Left Boost Mixer" },
+ { "Left Input Mixer", "Boost Switch", "LINPUT1" }, /* Really Boost Switch */
{ "Left Input Mixer", NULL, "LINPUT2" },
{ "Left Input Mixer", NULL, "LINPUT3" },
@@ -422,8 +422,8 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" },
{ "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" },
- { "Right Input Mixer", "Boost Switch", "Right Boost Mixer", },
- { "Right Input Mixer", NULL, "RINPUT1", }, /* Really Boost Switch */
+ { "Right Input Mixer", "Boost Switch", "Right Boost Mixer" },
+ { "Right Input Mixer", "Boost Switch", "RINPUT1" }, /* Really Boost Switch */
{ "Right Input Mixer", NULL, "RINPUT2" },
{ "Right Input Mixer", NULL, "RINPUT3" },
@@ -431,11 +431,11 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Right ADC", NULL, "Right Input Mixer" },
{ "Left Output Mixer", "LINPUT3 Switch", "LINPUT3" },
- { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer"} ,
+ { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer" },
{ "Left Output Mixer", "PCM Playback Switch", "Left DAC" },
{ "Right Output Mixer", "RINPUT3 Switch", "RINPUT3" },
- { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" } ,
+ { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" },
{ "Right Output Mixer", "PCM Playback Switch", "Right DAC" },
{ "LOUT1 PGA", NULL, "Left Output Mixer" },
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8960: add DAC mono mix kcontrol
2016-01-08 8:57 [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Zidan Wang
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
@ 2016-01-08 11:57 ` Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: add DAC mono mix kcontrol" to the asoc tree Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2016-01-08 11:57 UTC (permalink / raw)
To: Zidan Wang; +Cc: alsa-devel, broonie, patches, tiwai
On Fri, Jan 08, 2016 at 04:57:01PM +0800, Zidan Wang wrote:
> In normal operation, the left and right channel digital audio data is
> converted to analogue in two separate DACs. There is a mono-mix mode
> where the two audio channels are mixed together digitally and then
> converted to analogue using only one DAC, while the other DAC is
> switched off. The mono-mix signal can be selected to appear on both
> analogue output channels. The mono mix is automatically attenuated by
> 6dB to prevent clipping.
>
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
@ 2016-01-08 12:36 ` Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: boost switch should be closed when using L/RINPUT1" to the asoc tree Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2016-01-08 12:36 UTC (permalink / raw)
To: Zidan Wang; +Cc: alsa-devel, broonie, patches, tiwai
On Fri, Jan 08, 2016 at 04:57:02PM +0800, Zidan Wang wrote:
> L/RINPUT1 can line to Left/Right Boost Mixer through boost switch.
> If boost switch is open, there will be no voice when using L/RINPUT1.
>
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 6+ messages in thread
* Applied "ASoC: wm8960: boost switch should be closed when using L/RINPUT1" to the asoc tree
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
2016-01-08 12:36 ` Charles Keepax
@ 2016-01-08 13:44 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-01-08 13:44 UTC (permalink / raw)
To: Zidan Wang, Charles Keepax, Mark Brown; +Cc: alsa-devel
The patch
ASoC: wm8960: boost switch should be closed when using L/RINPUT1
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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 2d4a32602bc5d4d8f9a80c6b66a4e28d5f2d4798 Mon Sep 17 00:00:00 2001
From: Zidan Wang <zidan.wang@freescale.com>
Date: Fri, 8 Jan 2016 16:57:02 +0800
Subject: [PATCH] ASoC: wm8960: boost switch should be closed when using
L/RINPUT1
L/RINPUT1 can line to Left/Right Boost Mixer through boost switch.
If boost switch is open, there will be no voice when using L/RINPUT1.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/wm8960.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 9e90b8e2b86e..28bfe39b5f34 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -413,8 +413,8 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" },
{ "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" },
- { "Left Input Mixer", "Boost Switch", "Left Boost Mixer", },
- { "Left Input Mixer", NULL, "LINPUT1", }, /* Really Boost Switch */
+ { "Left Input Mixer", "Boost Switch", "Left Boost Mixer" },
+ { "Left Input Mixer", "Boost Switch", "LINPUT1" }, /* Really Boost Switch */
{ "Left Input Mixer", NULL, "LINPUT2" },
{ "Left Input Mixer", NULL, "LINPUT3" },
@@ -422,8 +422,8 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" },
{ "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" },
- { "Right Input Mixer", "Boost Switch", "Right Boost Mixer", },
- { "Right Input Mixer", NULL, "RINPUT1", }, /* Really Boost Switch */
+ { "Right Input Mixer", "Boost Switch", "Right Boost Mixer" },
+ { "Right Input Mixer", "Boost Switch", "RINPUT1" }, /* Really Boost Switch */
{ "Right Input Mixer", NULL, "RINPUT2" },
{ "Right Input Mixer", NULL, "RINPUT3" },
@@ -431,11 +431,11 @@ static const struct snd_soc_dapm_route audio_paths[] = {
{ "Right ADC", NULL, "Right Input Mixer" },
{ "Left Output Mixer", "LINPUT3 Switch", "LINPUT3" },
- { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer"} ,
+ { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer" },
{ "Left Output Mixer", "PCM Playback Switch", "Left DAC" },
{ "Right Output Mixer", "RINPUT3 Switch", "RINPUT3" },
- { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" } ,
+ { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" },
{ "Right Output Mixer", "PCM Playback Switch", "Right DAC" },
{ "LOUT1 PGA", NULL, "Left Output Mixer" },
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Applied "ASoC: wm8960: add DAC mono mix kcontrol" to the asoc tree
2016-01-08 8:57 [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Zidan Wang
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
2016-01-08 11:57 ` [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Charles Keepax
@ 2016-01-08 13:44 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-01-08 13:44 UTC (permalink / raw)
To: Zidan Wang, Charles Keepax, Mark Brown; +Cc: alsa-devel
The patch
ASoC: wm8960: add DAC mono mix kcontrol
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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 defbf708baf2a4cc4421699d02b57d7c3bb728b0 Mon Sep 17 00:00:00 2001
From: Zidan Wang <zidan.wang@freescale.com>
Date: Fri, 8 Jan 2016 16:57:01 +0800
Subject: [PATCH] ASoC: wm8960: add DAC mono mix kcontrol
In normal operation, the left and right channel digital audio data is
converted to analogue in two separate DACs. There is a mono-mix mode
where the two audio channels are mixed together digitally and then
converted to analogue using only one DAC, while the other DAC is
switched off. The mono-mix signal can be selected to appear on both
analogue output channels. The mono mix is automatically attenuated by
6dB to prevent clipping.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/wm8960.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 328bde09d5bf..9e90b8e2b86e 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -153,6 +153,7 @@ static const char *wm8960_adc_data_output_sel[] = {
"Left Data = Right ADC; Right Data = Right ADC",
"Left Data = Right ADC; Right Data = Left ADC",
};
+static const char *wm8960_dmonomix[] = {"Stereo", "Mono"};
static const struct soc_enum wm8960_enum[] = {
SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity),
@@ -162,6 +163,7 @@ static const struct soc_enum wm8960_enum[] = {
SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc),
SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode),
SOC_ENUM_SINGLE(WM8960_ADDCTL1, 2, 4, wm8960_adc_data_output_sel),
+ SOC_ENUM_SINGLE(WM8960_ADDCTL1, 4, 2, wm8960_dmonomix),
};
static const int deemph_settings[] = { 0, 32000, 44100, 48000 };
@@ -304,6 +306,7 @@ SOC_SINGLE_TLV("Right Output Mixer RINPUT3 Volume",
WM8960_ROUTMIX, 4, 7, 1, bypass_tlv),
SOC_ENUM("ADC Data Output Select", wm8960_enum[6]),
+SOC_ENUM("DAC Mono Mix", wm8960_enum[7]),
};
static const struct snd_kcontrol_new wm8960_lin_boost[] = {
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-08 13:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-08 8:57 [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Zidan Wang
2016-01-08 8:57 ` [PATCH] ASoC: wm8960: boost switch should be closed when using L/RINPUT1 Zidan Wang
2016-01-08 12:36 ` Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: boost switch should be closed when using L/RINPUT1" to the asoc tree Mark Brown
2016-01-08 11:57 ` [PATCH] ASoC: wm8960: add DAC mono mix kcontrol Charles Keepax
2016-01-08 13:44 ` Applied "ASoC: wm8960: add DAC mono mix kcontrol" to the asoc tree Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.