svn commit: r355805 - stable/12/sys/dev/sound/pci/hda

[Mark Johnston]

Author: markj
Date: Mon Dec 16 15:41:32 2019
New Revision: 355805
URL: https://svnweb.freebsd.org/changeset/base/355805

Log:
  MFC r355570:
  Configure headphone redirection for the Dell L780 and X1 Carbon 7th gen.

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/12/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/12/sys/dev/sound/pci/hda/hdaa_patches.c	Mon Dec 16 15:41:13 2019	(r355804)
+++ stable/12/sys/dev/sound/pci/hda/hdaa_patches.c	Mon Dec 16 15:41:32 2019	(r355805)
@@ -390,7 +390,8 @@ hdac_pin_patch(struct hdaa_widget *w)
 			break;
 		}
 	} else if (id == HDA_CODEC_ALC285 &&
-	    subid == LENOVO_X120KH_SUBVENDOR) {
+	    (subid == LENOVO_X120KH_SUBVENDOR ||
+	    subid == LENOVO_X120QD_SUBVENDOR)) {
 		switch (nid) {
 		case 33:
 			patch = "as=1 seq=15";
@@ -447,7 +448,8 @@ hdac_pin_patch(struct hdaa_widget *w)
 			config = 0x01a1913d;
 			break;
 		}
-	} else if (id == HDA_CODEC_ALC256 && subid == DELL_I7577_SUBVENDOR) {
+	} else if (id == HDA_CODEC_ALC256 && (subid == DELL_I7577_SUBVENDOR ||
+	    subid == DELL_L7480_SUBVENDOR)) {
 		switch (nid) {
 		case 20:
 			patch = "as=1 seq=0";

Modified: stable/12/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/12/sys/dev/sound/pci/hda/hdac.h	Mon Dec 16 15:41:13 2019	(r355804)
+++ stable/12/sys/dev/sound/pci/hda/hdac.h	Mon Dec 16 15:41:32 2019	(r355805)
@@ -200,6 +200,7 @@
 #define DELL_V1400_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x0227)
 #define DELL_V1500_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x0228)
 #define DELL_I1300_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x01c9)
+#define DELL_L7480_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x07a0)
 #define DELL_XPSM1210_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x01d7)
 #define DELL_OPLX745_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x01da)
 #define DELL_XPS9560_SUBVENDOR	HDA_MODEL_CONSTRUCT(DELL, 0x07be)
@@ -258,6 +259,7 @@
 #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_X120QD_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x2292)
 #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)