summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorHoward Mitchell <hm@hmbedded.co.uk>2015-03-19 13:08:29 +0100
committerMark Brown <broonie@kernel.org>2015-03-21 19:26:02 +0100
commit3088ef9f5dec3d72b24dcdd33d240823ab26b432 (patch)
treee0c2037222a4d8268c79ff9f9c4db5834d2f2bc1 /Documentation/sound
parentLinux 4.0-rc1 (diff)
downloadlinux-3088ef9f5dec3d72b24dcdd33d240823ab26b432.tar.xz
linux-3088ef9f5dec3d72b24dcdd33d240823ab26b432.zip
ALSA: ControlName.txt: Add 'Analogue' as a prefix for volume controls
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> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ControlNames.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
index 79a6127863ca..3fc1cf50d28e 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