summaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-19 17:12:42 +0100
committerTakashi Iwai <tiwai@suse.de>2013-03-07 18:29:52 +0100
commit967303dabc22335e83c6ee4a9e0684a7c05da976 (patch)
treef94d11ae35522d65fb437812ca6190a31775bcfd /Documentation/sound/alsa
parentALSA: snd-usb-caiaq: fix smatch warnings (diff)
downloadlinux-967303dabc22335e83c6ee4a9e0684a7c05da976.tar.xz
linux-967303dabc22335e83c6ee4a9e0684a7c05da976.zip
ALSA: hda - Add the generic Headphone Mic feature
This patch improves the generic parser code to allow to set up the headphone jack as a mic input. User can enable this feature by giving hp_mic hint string. The former shared hp/mic feature for the single built-in mic is still retained. This detection can be disabled now via hp_mic_detect hint string, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound/alsa')
-rw-r--r--Documentation/sound/alsa/HD-Audio.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index d4faa63ff352..77e176a35ce1 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -466,6 +466,9 @@ The generic parser supports the following hints:
- add_in_jack_modes (bool): add "xxx Jack Mode" enum controls to each
input jack for allowing to change the mic bias vref
- power_down_unused (bool): power down the unused widgets
+- add_hp_mic (bool): add the headphone to capture source if possible
+- hp_mic_detect (bool): enable/disable the hp/mic shared input for a
+ single built-in mic case; default true
- mixer_nid (int): specifies the widget NID of the analog-loopback
mixer