Browse Source

ALSA: hda - Add "eapd" model string for AD1986A codec

Also update the documentation to the latest state.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 10 years ago
parent
commit
9faa73f06e
2 changed files with 3 additions and 6 deletions
  1. 2 6
      Documentation/sound/alsa/HD-Audio-Models.txt
  2. 1 0
      sound/pci/hda/patch_analog.c

+ 2 - 6
Documentation/sound/alsa/HD-Audio-Models.txt

@@ -113,14 +113,10 @@ AD1984
 
 
 AD1986A
 AD1986A
 =======
 =======
-  6stack	6-jack, separate surrounds (default)
   3stack	3-stack, shared surrounds
   3stack	3-stack, shared surrounds
   laptop	2-channel only (FSC V2060, Samsung M50)
   laptop	2-channel only (FSC V2060, Samsung M50)
-  laptop-eapd	2-channel with EAPD (ASUS A6J)
-  laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100)
-  ultra		2-channel with EAPD (Samsung Ultra tablet PC)
-  samsung	2-channel with EAPD (Samsung R65)
-  samsung-p50	2-channel with HP-automute (Samsung P50)
+  laptop-imic	2-channel with built-in mic
+  eapd		Turn on EAPD constantly
 
 
 AD1988/AD1988B/AD1989A/AD1989B
 AD1988/AD1988B/AD1989A/AD1989B
 ==============================
 ==============================

+ 1 - 0
sound/pci/hda/patch_analog.c

@@ -352,6 +352,7 @@ static const struct hda_model_fixup ad1986a_fixup_models[] = {
 	{ .id = AD1986A_FIXUP_LAPTOP, .name = "laptop" },
 	{ .id = AD1986A_FIXUP_LAPTOP, .name = "laptop" },
 	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-imic" },
 	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-imic" },
 	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-eapd" }, /* alias */
 	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-eapd" }, /* alias */
+	{ .id = AD1986A_FIXUP_EAPD, .name = "eapd" },
 	{}
 	{}
 };
 };