summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-10-11 10:18:46 +0200
committerTakashi Iwai <tiwai@suse.de>2013-10-11 10:23:49 +0200
commit7c478f03372ad2cf434fde62082895bfcb6e6e89 (patch)
tree0384f624374b9c53c2232dc42c8f573a2087351d /Documentation/sound
parent88cfcf86aa3ada84d97195bcad74f4dadb4ae23b (diff)
downloadlinux-stable-7c478f03372ad2cf434fde62082895bfcb6e6e89.tar.gz
linux-stable-7c478f03372ad2cf434fde62082895bfcb6e6e89.tar.bz2
linux-stable-7c478f03372ad2cf434fde62082895bfcb6e6e89.zip
ALSA: hda - Add a headset mic model for ALC269 and friends
Using the headset mic model will cause the headset mic to be labeled "headset mic" instead of just "mic". Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index f911e3656209..85c362d8ea34 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x
alc269-dmic Enable ALC269(VA) digital mic workaround
alc271-dmic Enable ALC271X digital mic workaround
inv-dmic Inverted internal mic workaround
+ headset-mic Indicates a combined headset (headphone+mic) jack
lenovo-dock Enables docking station I/O for some Lenovos
dell-headset-multi Headset jack, which can also be used as mic-in
dell-headset-dock Headset jack (without mic-in), and also dock I/O