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

[Alexander Motin]

Author: mav
Date: Thu Aug  6 15:23:51 2020
New Revision: 363957
URL: https://svnweb.freebsd.org/changeset/base/363957

Log:
  MFC r354143 (by scottl):
  Add device IDs for the next generation of Intel HDA audio.

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

Modified: stable/12/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/12/sys/dev/sound/pci/hda/hdac.c	Thu Aug  6 15:20:31 2020	(r363956)
+++ stable/12/sys/dev/sound/pci/hda/hdac.c	Thu Aug  6 15:23:51 2020	(r363957)
@@ -108,6 +108,10 @@ static const struct {
 	{ HDA_INTEL_CFLK,    "Intel Coffee Lake",	0, 0 },
 	{ HDA_INTEL_CMLKS,   "Intel Comet Lake-S",	0, 0 },
 	{ HDA_INTEL_CNLK,    "Intel Cannon Lake",	0, 0 },
+	{ HDA_INTEL_ICLK,    "Intel Ice Lake",		0, 0 },
+	{ HDA_INTEL_CMLKLP,  "Intel Comet Lake-LP",	0, 0 },
+	{ HDA_INTEL_CMLKH,   "Intel Comet Lake-H",	0, 0 },
+	{ HDA_INTEL_GMLK,    "Intel Gemini Lake",	0, 0 },
 	{ HDA_INTEL_82801F,  "Intel 82801F",	0, 0 },
 	{ HDA_INTEL_63XXESB, "Intel 631x/632xESB",	0, 0 },
 	{ HDA_INTEL_82801G,  "Intel 82801G",	0, 0 },

Modified: stable/12/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/12/sys/dev/sound/pci/hda/hdac.h	Thu Aug  6 15:20:31 2020	(r363956)
+++ stable/12/sys/dev/sound/pci/hda/hdac.h	Thu Aug  6 15:23:51 2020	(r363957)
@@ -87,6 +87,10 @@
 #define HDA_INTEL_CFLK		HDA_MODEL_CONSTRUCT(INTEL, 0xa348)
 #define HDA_INTEL_CMLKS		HDA_MODEL_CONSTRUCT(INTEL, 0xa3f0)
 #define HDA_INTEL_CNLK		HDA_MODEL_CONSTRUCT(INTEL, 0x9dc8)
+#define HDA_INTEL_ICLK		HDA_MODEL_CONSTRUCT(INTEL, 0x34c8)
+#define HDA_INTEL_CMLKLP	HDA_MODEL_CONSTRUCT(INTEL, 0x02c8)
+#define HDA_INTEL_CMLKH 	HDA_MODEL_CONSTRUCT(INTEL, 0x06c8)
+#define HDA_INTEL_GMLK		HDA_MODEL_CONSTRUCT(INTEL, 0x3198)
 #define HDA_INTEL_ALL		HDA_MODEL_CONSTRUCT(INTEL, 0xffff)
 
 /* Nvidia */
@@ -709,6 +713,7 @@
 
 /* INTEL */
 #define HDA_CODEC_INTELIP	HDA_CODEC_CONSTRUCT(INTEL, 0x0054)
+#define HDA_CODEC_INTELGMLK	HDA_CODEC_CONSTRUCT(INTEL, 0x2800)
 #define HDA_CODEC_INTELBL	HDA_CODEC_CONSTRUCT(INTEL, 0x2801)
 #define HDA_CODEC_INTELCA	HDA_CODEC_CONSTRUCT(INTEL, 0x2802)
 #define HDA_CODEC_INTELEL	HDA_CODEC_CONSTRUCT(INTEL, 0x2803)
@@ -718,7 +723,11 @@
 #define HDA_CODEC_INTELHSW	HDA_CODEC_CONSTRUCT(INTEL, 0x2807)
 #define HDA_CODEC_INTELBDW	HDA_CODEC_CONSTRUCT(INTEL, 0x2808)
 #define HDA_CODEC_INTELSKLK	HDA_CODEC_CONSTRUCT(INTEL, 0x2809)
+#define HDA_CODEC_INTELBXTN	HDA_CODEC_CONSTRUCT(INTEL, 0x280a)
 #define HDA_CODEC_INTELKBLK	HDA_CODEC_CONSTRUCT(INTEL, 0x280b)
+#define HDA_CODEC_INTELCNLK	HDA_CODEC_CONSTRUCT(INTEL, 0x280c)
+#define HDA_CODEC_INTELGMLK1	HDA_CODEC_CONSTRUCT(INTEL, 0x280d)
+#define HDA_CODEC_INTELICLK	HDA_CODEC_CONSTRUCT(INTEL, 0x280f)
 #define HDA_CODEC_INTELJLK	HDA_CODEC_CONSTRUCT(INTEL, 0x281a)
 #define HDA_CODEC_INTELELLK	HDA_CODEC_CONSTRUCT(INTEL, 0x281b)
 #define HDA_CODEC_INTELCT	HDA_CODEC_CONSTRUCT(INTEL, 0x2880)

Modified: stable/12/sys/dev/sound/pci/hda/hdacc.c
==============================================================================
--- stable/12/sys/dev/sound/pci/hda/hdacc.c	Thu Aug  6 15:20:31 2020	(r363956)
+++ stable/12/sys/dev/sound/pci/hda/hdacc.c	Thu Aug  6 15:23:51 2020	(r363957)
@@ -387,6 +387,11 @@ static const struct {
 	{ HDA_CODEC_INTELVV2, 0,	"Intel Valleyview2" },
 	{ HDA_CODEC_INTELBR, 0,		"Intel Braswell" },
 	{ HDA_CODEC_INTELCL, 0,		"Intel Crestline" },
+	{ HDA_CODEC_INTELBXTN, 0,	"Intel Broxton" },
+	{ HDA_CODEC_INTELCNLK, 0,	"Intel Cannonlake" },
+	{ HDA_CODEC_INTELGMLK, 0,	"Intel Geminilake" },
+	{ HDA_CODEC_INTELGMLK1, 0,	"Intel Geminilake" },
+	{ HDA_CODEC_INTELICLK, 0,	"Intel Icelake" },
 	{ HDA_CODEC_SII1390, 0,		"Silicon Image SiI1390" },
 	{ HDA_CODEC_SII1392, 0,		"Silicon Image SiI1392" },
 	/* Unknown CODECs */