svn commit: r351814 - in stable: 11/sys/dev/sound/pci/hda 12/sys/dev/sound/pci/hda

[Jung-uk Kim]

Author: jkim
Date: Wed Sep  4 14:05:04 2019
New Revision: 351814
URL: https://svnweb.freebsd.org/changeset/base/351814

Log:
  MFC:	r351231, r351233
  
  Fix sound on headset jack for Lenovo Thinkpad X1 Carbon Gen 6 (model 20KH).

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

Changes in other areas also in this revision:
Modified:
  stable/12/sys/dev/sound/pci/hda/hdaa_patches.c
  stable/12/sys/dev/sound/pci/hda/hdac.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/11/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Sep  4 13:59:06 2019	(r351813)
+++ stable/11/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Sep  4 14:05:04 2019	(r351814)
@@ -387,6 +387,13 @@ hdac_pin_patch(struct hdaa_widget *w)
 			patch = "as=1 seq=15";
 			break;
 		}
+	} else if (id == HDA_CODEC_ALC285 &&
+	    subid == LENOVO_X120KH_SUBVENDOR) {
+		switch (nid) {
+		case 33:
+			patch = "as=1 seq=15";
+			break;
+		}
 	} else if (id == HDA_CODEC_ALC269 &&
 	    subid == ASUS_UX31A_SUBVENDOR) {
 		switch (nid) {

Modified: stable/11/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/11/sys/dev/sound/pci/hda/hdac.h	Wed Sep  4 13:59:06 2019	(r351813)
+++ stable/11/sys/dev/sound/pci/hda/hdac.h	Wed Sep  4 14:05:04 2019	(r351814)
@@ -252,6 +252,7 @@
 #define	LENOVO_X1_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21e8)
 #define	LENOVO_X1CRBN_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21f9)
 #define	LENOVO_X120BS_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x2227)
+#define	LENOVO_X120KH_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x225c)
 #define LENOVO_X220_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21da)
 #define LENOVO_X300_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x20ac)
 #define	LENOVO_T400_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x20f2)