svn commit: r248148 - stable/9/sys/dev/sound/pci/hda

[Alexander Motin]

Author: mav
Date: Mon Mar 11 07:53:51 2013
New Revision: 248148
URL: http://svnweb.freebsd.org/changeset/base/248148

Log:
  MFC r247815:
  Add quirk to enable headphones redirection on Lenovo X220.
  
  PR:		kern/174876

Modified:
  stable/9/sys/dev/sound/pci/hda/hdaa_patches.c
  stable/9/sys/dev/sound/pci/hda/hdac.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/9/sys/dev/sound/pci/hda/hdaa_patches.c	Mon Mar 11 07:10:15 2013	(r248147)
+++ stable/9/sys/dev/sound/pci/hda/hdaa_patches.c	Mon Mar 11 07:53:51 2013	(r248148)
@@ -333,6 +333,13 @@ hdac_pin_patch(struct hdaa_widget *w)
 			patch = "as=1 seq=15";
 			break;
 		}
+	} else if (id == HDA_CODEC_CX20590 &&
+	    subid == LENOVO_X220_SUBVENDOR) {
+		switch (nid) {
+		case 25:
+			patch = "as=1 seq=15";
+			break;
+		}
 	}
 
 	if (patch != NULL)

Modified: stable/9/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/9/sys/dev/sound/pci/hda/hdac.h	Mon Mar 11 07:10:15 2013	(r248147)
+++ stable/9/sys/dev/sound/pci/hda/hdac.h	Mon Mar 11 07:53:51 2013	(r248148)
@@ -220,6 +220,7 @@
 #define LENOVO_3KN200_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x384e)
 #define LENOVO_B450_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3a0d)
 #define LENOVO_TCA55_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x1015)
+#define LENOVO_X220_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21da)
 #define LENOVO_X300_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x20ac)
 #define LENOVO_ALL_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0xffff)