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>

diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
index 79a6127863ca8216294f9861d068e31b5a09bd16..3fc1cf50d28e18c0d1706e8b99304bbfb780dcd1 100644 (file)
--- 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