svn commit: r354143 - head/sys/dev/sound/pci/hda

[Scott Long]

Author: scottl
Date: Mon Oct 28 23:31:22 2019
New Revision: 354143
URL: https://svnweb.freebsd.org/changeset/base/354143

Log:
  Add device IDs for the next generation of Intel HDA audio.
  
  MFC after:	3 days

Modified:
  head/sys/dev/sound/pci/hda/hdac.c
  head/sys/dev/sound/pci/hda/hdac.h
  head/sys/dev/sound/pci/hda/hdacc.c

Modified: head/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.c	Mon Oct 28 22:54:36 2019	(r354142)
+++ head/sys/dev/sound/pci/hda/hdac.c	Mon Oct 28 23:31:22 2019	(r354143)
@@ -103,6 +103,10 @@ static const struct {
 	{ HDA_INTEL_KBLKH,   "Intel Kaby Lake-H",	0, 0 },
 	{ HDA_INTEL_CFLK,    "Intel Coffee Lake",	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: head/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.h	Mon Oct 28 22:54:36 2019	(r354142)
+++ head/sys/dev/sound/pci/hda/hdac.h	Mon Oct 28 23:31:22 2019	(r354143)
@@ -78,6 +78,10 @@
 #define HDA_INTEL_KBLKH		HDA_MODEL_CONSTRUCT(INTEL, 0xa2f0)
 #define HDA_INTEL_CFLK		HDA_MODEL_CONSTRUCT(INTEL, 0xa348)
 #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 */
@@ -684,6 +688,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)
@@ -693,7 +698,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_INTELCL	HDA_CODEC_CONSTRUCT(INTEL, 0x29fb)
 #define HDA_CODEC_INTELXXXX	HDA_CODEC_CONSTRUCT(INTEL, 0xffff)
 

Modified: head/sys/dev/sound/pci/hda/hdacc.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdacc.c	Mon Oct 28 22:54:36 2019	(r354142)
+++ head/sys/dev/sound/pci/hda/hdacc.c	Mon Oct 28 23:31:22 2019	(r354143)
@@ -370,6 +370,11 @@ static const struct {
 	{ HDA_CODEC_INTELSKLK, 0,	"Intel Skylake" },
 	{ HDA_CODEC_INTELKBLK, 0,	"Intel Kaby Lake" },
 	{ 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 */