* [PATCH 2/2] ASoC:pcm512x: Add 'Analogue' prefix to analogue volume controls
2015-03-19 12:08 [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls Howard Mitchell
@ 2015-03-19 12:08 ` Howard Mitchell
2015-03-21 7:50 ` [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for " Takashi Iwai
2015-03-21 18:26 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Howard Mitchell @ 2015-03-19 12:08 UTC (permalink / raw)
To: broonie, tiwai
Cc: lgirdwood, perex, corbet, alsa-devel, linux-doc, linux-kernel,
gordon, Howard Mitchell
This is to ensure that 'alsactl restore' does not apply default
initialisation as the chip reset defaults are preferred.
Signed-off-by: Howard Mitchell <hm@hmbedded.co.uk>
---
sound/soc/codecs/pcm512x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 4b5f1fe..5301c4a 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -391,9 +391,9 @@ static const struct soc_enum pcm512x_veds =
static const struct snd_kcontrol_new pcm512x_controls[] = {
SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2,
PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),
-SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
+SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),
-SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
+SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),
SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
PCM512x_RQMR_SHIFT, 1, 1),
--
1.7.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls
2015-03-19 12:08 [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls Howard Mitchell
2015-03-19 12:08 ` [PATCH 2/2] ASoC:pcm512x: Add 'Analogue' prefix to analogue " Howard Mitchell
@ 2015-03-21 7:50 ` Takashi Iwai
2015-03-21 18:26 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2015-03-21 7:50 UTC (permalink / raw)
To: Howard Mitchell
Cc: broonie, lgirdwood, perex, corbet, alsa-devel, linux-doc,
linux-kernel, gordon
At Thu, 19 Mar 2015 12:08:29 +0000,
Howard Mitchell wrote:
>
> Currently 'Playback Volume' is the correct way to express an analogue
> volume control. However, this control name has initialisation defaults
> applied when using 'alsactl restore' and in some cases this is not
> appropriate. An example would be a control that has a selection of
> 0db and -6dB of gain that is intended to set the fullscale ouput
> voltage of a DAC. The TI pcm512x family of DAcs have such a control.
> In this case the device/driver reset defaults are preferred.
>
> Signed-off-by: Howard Mitchell <hm@hmbedded.co.uk>
Mark, feel free to take this if you apply the next one.
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> Documentation/sound/alsa/ControlNames.txt | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
> index 79a6127..3fc1cf50 100644
> --- a/Documentation/sound/alsa/ControlNames.txt
> +++ b/Documentation/sound/alsa/ControlNames.txt
> @@ -71,11 +71,11 @@ SOURCE:
> HDMI/DP (either HDMI or DisplayPort)
>
> Exceptions (deprecated):
> - [Digital] Capture Source
> - [Digital] Capture Switch (aka input gain switch)
> - [Digital] Capture Volume (aka input gain volume)
> - [Digital] Playback Switch (aka output gain switch)
> - [Digital] Playback Volume (aka output gain volume)
> + [Analogue|Digital] Capture Source
> + [Analogue|Digital] Capture Switch (aka input gain switch)
> + [Analogue|Digital] Capture Volume (aka input gain volume)
> + [Analogue|Digital] Playback Switch (aka output gain switch)
> + [Analogue|Digital] Playback Volume (aka output gain volume)
> Tone Control - Switch
> Tone Control - Bass
> Tone Control - Treble
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls
2015-03-19 12:08 [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls Howard Mitchell
2015-03-19 12:08 ` [PATCH 2/2] ASoC:pcm512x: Add 'Analogue' prefix to analogue " Howard Mitchell
2015-03-21 7:50 ` [PATCH 1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for " Takashi Iwai
@ 2015-03-21 18:26 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2015-03-21 18:26 UTC (permalink / raw)
To: Howard Mitchell
Cc: tiwai, lgirdwood, perex, corbet, alsa-devel, linux-doc,
linux-kernel, gordon
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
On Thu, Mar 19, 2015 at 12:08:29PM +0000, Howard Mitchell wrote:
> Currently 'Playback Volume' is the correct way to express an analogue
> volume control. However, this control name has initialisation defaults
> applied when using 'alsactl restore' and in some cases this is not
Applied both, thanks. Please use subject lines matching the style for
the subsystem.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread