diff mbox

[1/2] ALSA:ControlName.txt: Add 'Analogue' as a prefix for volume controls

Message ID 1426766910-27250-1-git-send-email-hm@hmbedded.co.uk (mailing list archive)
State Accepted
Commit 3088ef9f5dec3d72b24dcdd33d240823ab26b432
Headers show

Commit Message

Howard Mitchell March 19, 2015, 12:08 p.m. UTC
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>
---
 Documentation/sound/alsa/ControlNames.txt |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Takashi Iwai March 21, 2015, 7:50 a.m. UTC | #1
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
>
Mark Brown March 21, 2015, 6:26 p.m. UTC | #2
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.
diff mbox

Patch

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