Author: mav
Date: Fri Jun 5 15:06:58 2020
New Revision: 361835
URL: https://svnweb.freebsd.org/changeset/base/361835
Log:
Add bunch of HDA controller and codec IDs.
MFC after: 2 weeks
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 Fri Jun 5 14:17:19 2020
(r361834)
+++ head/sys/dev/sound/pci/hda/hdac.c Fri Jun 5 15:06:58 2020
(r361835)
@@ -79,15 +79,19 @@ static const struct {
char quirks_off;
} hdac_devices[] = {
{ HDA_INTEL_OAK, "Intel Oaktrail", 0, 0 },
+ { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 },
+ { HDA_INTEL_CMLKH, "Intel Comet Lake-H", 0, 0 },
{ HDA_INTEL_BAY, "Intel BayTrail", 0, 0 },
{ HDA_INTEL_HSW1, "Intel Haswell", 0, 0 },
{ HDA_INTEL_HSW2, "Intel Haswell", 0, 0 },
{ HDA_INTEL_HSW3, "Intel Haswell", 0, 0 },
{ HDA_INTEL_BDW1, "Intel Broadwell", 0, 0 },
{ HDA_INTEL_BDW2, "Intel Broadwell", 0, 0 },
+ { HDA_INTEL_BXTNT, "Intel Broxton-T", 0, 0 },
{ HDA_INTEL_CPT, "Intel Cougar Point", 0, 0 },
{ HDA_INTEL_PATSBURG,"Intel Patsburg", 0, 0 },
{ HDA_INTEL_PPT1, "Intel Panther Point", 0, 0 },
+ { HDA_INTEL_BR, "Intel Braswell", 0, 0 },
{ HDA_INTEL_LPT1, "Intel Lynx Point", 0, 0 },
{ HDA_INTEL_LPT2, "Intel Lynx Point", 0, 0 },
{ HDA_INTEL_WCPT, "Intel Wildcat Point", 0, 0 },
@@ -101,6 +105,7 @@ static const struct {
{ HDA_INTEL_KBLK, "Intel Kaby Lake", 0, 0 },
{ HDA_INTEL_KBLKH, "Intel Kaby Lake-H", 0, 0 },
{ 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 },
@@ -112,10 +117,14 @@ static const struct {
{ HDA_INTEL_82801G, "Intel 82801G", 0, 0 },
{ HDA_INTEL_82801H, "Intel 82801H", 0, 0 },
{ HDA_INTEL_82801I, "Intel 82801I", 0, 0 },
+ { HDA_INTEL_JLK, "Intel Jasper Lake", 0, 0 },
{ HDA_INTEL_82801JI, "Intel 82801JI", 0, 0 },
{ HDA_INTEL_82801JD, "Intel 82801JD", 0, 0 },
{ HDA_INTEL_PCH, "Intel Ibex Peak", 0, 0 },
{ HDA_INTEL_PCH2, "Intel Ibex Peak", 0, 0 },
+ { HDA_INTEL_ELLK, "Intel Elkhart Lake", 0, 0 },
+ { HDA_INTEL_JLK2, "Intel Jasper Lake", 0, 0 },
+ { HDA_INTEL_BXTNP, "Intel Broxton-P", 0, 0 },
{ HDA_INTEL_SCH, "Intel SCH", 0, 0 },
{ HDA_NVIDIA_MCP51, "NVIDIA MCP51", 0, HDAC_QUIRK_MSI },
{ HDA_NVIDIA_MCP55, "NVIDIA MCP55", 0, HDAC_QUIRK_MSI },
@@ -173,6 +182,10 @@ static const struct {
{ HDA_ATI_RV940, "ATI RV940", 0, 0 },
{ HDA_ATI_RV970, "ATI RV970", 0, 0 },
{ HDA_ATI_R1000, "ATI R1000", 0, 0 },
+ { HDA_AMD_X370, "AMD X370", 0, 0 },
+ { HDA_AMD_X570, "AMD X570", 0, 0 },
+ { HDA_AMD_STONEY, "AMD Stoney", 0, 0 },
+ { HDA_AMD_RAVEN, "AMD Raven", 0, 0 },
{ HDA_AMD_HUDSON2, "AMD Hudson-2", 0, 0 },
{ HDA_RDC_M3010, "RDC M3010", 0, 0 },
{ HDA_VIA_VT82XX, "VIA VT8251/8237A",0, 0 },
Modified: head/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.h Fri Jun 5 14:17:19 2020
(r361834)
+++ head/sys/dev/sound/pci/hda/hdac.h Fri Jun 5 15:06:58 2020
(r361835)
@@ -43,24 +43,32 @@
/* Intel */
#define INTEL_VENDORID 0x8086
+#define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8)
+#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8)
#define HDA_INTEL_OAK HDA_MODEL_CONSTRUCT(INTEL, 0x080a)
#define HDA_INTEL_BAY HDA_MODEL_CONSTRUCT(INTEL, 0x0f04)
#define HDA_INTEL_HSW1 HDA_MODEL_CONSTRUCT(INTEL, 0x0a0c)
#define HDA_INTEL_HSW2 HDA_MODEL_CONSTRUCT(INTEL, 0x0c0c)
#define HDA_INTEL_HSW3 HDA_MODEL_CONSTRUCT(INTEL, 0x0d0c)
#define HDA_INTEL_BDW1 HDA_MODEL_CONSTRUCT(INTEL, 0x160c)
+#define HDA_INTEL_BXTNT HDA_MODEL_CONSTRUCT(INTEL, 0x1a98)
#define HDA_INTEL_CPT HDA_MODEL_CONSTRUCT(INTEL, 0x1c20)
#define HDA_INTEL_PATSBURG HDA_MODEL_CONSTRUCT(INTEL, 0x1d20)
#define HDA_INTEL_PPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x1e20)
+#define HDA_INTEL_BR HDA_MODEL_CONSTRUCT(INTEL, 0x2284)
#define HDA_INTEL_82801F HDA_MODEL_CONSTRUCT(INTEL, 0x2668)
#define HDA_INTEL_63XXESB HDA_MODEL_CONSTRUCT(INTEL, 0x269a)
#define HDA_INTEL_82801G HDA_MODEL_CONSTRUCT(INTEL, 0x27d8)
#define HDA_INTEL_82801H HDA_MODEL_CONSTRUCT(INTEL, 0x284b)
#define HDA_INTEL_82801I HDA_MODEL_CONSTRUCT(INTEL, 0x293e)
+#define HDA_INTEL_JLK HDA_MODEL_CONSTRUCT(INTEL, 0x38c8)
#define HDA_INTEL_82801JI HDA_MODEL_CONSTRUCT(INTEL, 0x3a3e)
#define HDA_INTEL_82801JD HDA_MODEL_CONSTRUCT(INTEL, 0x3a6e)
#define HDA_INTEL_PCH HDA_MODEL_CONSTRUCT(INTEL, 0x3b56)
#define HDA_INTEL_PCH2 HDA_MODEL_CONSTRUCT(INTEL, 0x3b57)
+#define HDA_INTEL_ELLK HDA_MODEL_CONSTRUCT(INTEL, 0x4b55)
+#define HDA_INTEL_JLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x4dc8)
+#define HDA_INTEL_BXTNP HDA_MODEL_CONSTRUCT(INTEL, 0x5a98)
#define HDA_INTEL_MACBOOKPRO92 HDA_MODEL_CONSTRUCT(INTEL, 0x7270)
#define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b)
#define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8c20)
@@ -77,6 +85,7 @@
#define HDA_INTEL_KBLK HDA_MODEL_CONSTRUCT(INTEL, 0xa171)
#define HDA_INTEL_KBLKH HDA_MODEL_CONSTRUCT(INTEL, 0xa2f0)
#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)
@@ -151,6 +160,10 @@
#define HDA_ATI_ALL HDA_MODEL_CONSTRUCT(ATI, 0xffff)
#define AMD_VENDORID 0x1022
+#define HDA_AMD_X370 HDA_MODEL_CONSTRUCT(AMD, 0x1457)
+#define HDA_AMD_X570 HDA_MODEL_CONSTRUCT(AMD, 0x1487)
+#define HDA_AMD_STONEY HDA_MODEL_CONSTRUCT(AMD, 0x157a)
+#define HDA_AMD_RAVEN HDA_MODEL_CONSTRUCT(AMD, 0x15e3)
#define HDA_AMD_HUDSON2 HDA_MODEL_CONSTRUCT(AMD, 0x780d)
#define HDA_AMD_ALL HDA_MODEL_CONSTRUCT(AMD, 0xffff)
@@ -358,12 +371,16 @@
/* Realtek */
#define REALTEK_VENDORID 0x10ec
+#define HDA_CODEC_ALC215 HDA_CODEC_CONSTRUCT(REALTEK, 0x0215)
#define HDA_CODEC_ALC221 HDA_CODEC_CONSTRUCT(REALTEK, 0x0221)
+#define HDA_CODEC_ALC222 HDA_CODEC_CONSTRUCT(REALTEK, 0x0222)
#define HDA_CODEC_ALC225 HDA_CODEC_CONSTRUCT(REALTEK, 0x0225)
#define HDA_CODEC_ALC231 HDA_CODEC_CONSTRUCT(REALTEK, 0x0231)
#define HDA_CODEC_ALC233 HDA_CODEC_CONSTRUCT(REALTEK, 0x0233)
#define HDA_CODEC_ALC234 HDA_CODEC_CONSTRUCT(REALTEK, 0x0234)
#define HDA_CODEC_ALC235 HDA_CODEC_CONSTRUCT(REALTEK, 0x0235)
+#define HDA_CODEC_ALC236 HDA_CODEC_CONSTRUCT(REALTEK, 0x0236)
+#define HDA_CODEC_ALC245 HDA_CODEC_CONSTRUCT(REALTEK, 0x0245)
#define HDA_CODEC_ALC255 HDA_CODEC_CONSTRUCT(REALTEK, 0x0255)
#define HDA_CODEC_ALC256 HDA_CODEC_CONSTRUCT(REALTEK, 0x0256)
#define HDA_CODEC_ALC257 HDA_CODEC_CONSTRUCT(REALTEK, 0x0257)
@@ -385,6 +402,7 @@
#define HDA_CODEC_ALC285 HDA_CODEC_CONSTRUCT(REALTEK, 0x0285)
#define HDA_CODEC_ALC286 HDA_CODEC_CONSTRUCT(REALTEK, 0x0286)
#define HDA_CODEC_ALC288 HDA_CODEC_CONSTRUCT(REALTEK, 0x0288)
+#define HDA_CODEC_ALC289 HDA_CODEC_CONSTRUCT(REALTEK, 0x0289)
#define HDA_CODEC_ALC290 HDA_CODEC_CONSTRUCT(REALTEK, 0x0290)
#define HDA_CODEC_ALC292 HDA_CODEC_CONSTRUCT(REALTEK, 0x0292)
#define HDA_CODEC_ALC293 HDA_CODEC_CONSTRUCT(REALTEK, 0x0293)
@@ -394,6 +412,8 @@
#define HDA_CODEC_ALC299 HDA_CODEC_CONSTRUCT(REALTEK, 0x0299)
#define HDA_CODEC_ALC292 HDA_CODEC_CONSTRUCT(REALTEK, 0x0292)
#define HDA_CODEC_ALC295 HDA_CODEC_CONSTRUCT(REALTEK, 0x0295)
+#define HDA_CODEC_ALC300 HDA_CODEC_CONSTRUCT(REALTEK, 0x0300)
+#define HDA_CODEC_ALC623 HDA_CODEC_CONSTRUCT(REALTEK, 0x0623)
#define HDA_CODEC_ALC660 HDA_CODEC_CONSTRUCT(REALTEK, 0x0660)
#define HDA_CODEC_ALC662 HDA_CODEC_CONSTRUCT(REALTEK, 0x0662)
#define HDA_CODEC_ALC663 HDA_CODEC_CONSTRUCT(REALTEK, 0x0663)
@@ -416,6 +436,8 @@
#define HDA_CODEC_ALC892 HDA_CODEC_CONSTRUCT(REALTEK, 0x0892)
#define HDA_CODEC_ALC899 HDA_CODEC_CONSTRUCT(REALTEK, 0x0899)
#define HDA_CODEC_ALC1150 HDA_CODEC_CONSTRUCT(REALTEK, 0x0900)
+#define HDA_CODEC_ALCS1200A HDA_CODEC_CONSTRUCT(REALTEK, 0x0b00)
+#define HDA_CODEC_ALC1220_1 HDA_CODEC_CONSTRUCT(REALTEK, 0x1168)
#define HDA_CODEC_ALC1220 HDA_CODEC_CONSTRUCT(REALTEK, 0x1220)
#define HDA_CODEC_ALCXXXX HDA_CODEC_CONSTRUCT(REALTEK, 0xffff)
@@ -708,6 +730,11 @@
#define HDA_CODEC_INTELGMLK1 HDA_CODEC_CONSTRUCT(INTEL, 0x280d)
#define HDA_CODEC_INTELICLK HDA_CODEC_CONSTRUCT(INTEL, 0x280f)
#define HDA_CODEC_INTELTGLK HDA_CODEC_CONSTRUCT(INTEL, 0x2812)
+#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)
+#define HDA_CODEC_INTELVV2 HDA_CODEC_CONSTRUCT(INTEL, 0x2882)
+#define HDA_CODEC_INTELBR HDA_CODEC_CONSTRUCT(INTEL, 0x2883)
#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 Fri Jun 5 14:17:19 2020
(r361834)
+++ head/sys/dev/sound/pci/hda/hdacc.c Fri Jun 5 15:06:58 2020
(r361835)
@@ -77,12 +77,16 @@ static const struct {
{ HDA_CODEC_CS4206, 0, "Cirrus Logic CS4206" },
{ HDA_CODEC_CS4207, 0, "Cirrus Logic CS4207" },
{ HDA_CODEC_CS4210, 0, "Cirrus Logic CS4210" },
+ { HDA_CODEC_ALC215, 0, "Realtek ALC215" },
{ HDA_CODEC_ALC221, 0, "Realtek ALC221" },
+ { HDA_CODEC_ALC222, 0, "Realtek ALC222" },
{ HDA_CODEC_ALC225, 0, "Realtek ALC225" },
{ HDA_CODEC_ALC231, 0, "Realtek ALC231" },
{ HDA_CODEC_ALC233, 0, "Realtek ALC233" },
{ HDA_CODEC_ALC234, 0, "Realtek ALC234" },
{ HDA_CODEC_ALC235, 0, "Realtek ALC235" },
+ { HDA_CODEC_ALC236, 0, "Realtek ALC236" },
+ { HDA_CODEC_ALC245, 0, "Realtek ALC245" },
{ HDA_CODEC_ALC255, 0, "Realtek ALC255" },
{ HDA_CODEC_ALC256, 0, "Realtek ALC256" },
{ HDA_CODEC_ALC257, 0, "Realtek ALC257" },
@@ -106,6 +110,7 @@ static const struct {
{ HDA_CODEC_ALC285, 0, "Realtek ALC285" },
{ HDA_CODEC_ALC286, 0, "Realtek ALC286" },
{ HDA_CODEC_ALC288, 0, "Realtek ALC288" },
+ { HDA_CODEC_ALC289, 0, "Realtek ALC289" },
{ HDA_CODEC_ALC290, 0, "Realtek ALC290" },
{ HDA_CODEC_ALC292, 0, "Realtek ALC292" },
{ HDA_CODEC_ALC293, 0, "Realtek ALC293" },
@@ -113,8 +118,12 @@ static const struct {
{ HDA_CODEC_ALC295, 0, "Realtek ALC295" },
{ HDA_CODEC_ALC298, 0, "Realtek ALC298" },
{ HDA_CODEC_ALC299, 0, "Realtek ALC299" },
+ { HDA_CODEC_ALC300, 0, "Realtek ALC300" },
+ { HDA_CODEC_ALC623, 0, "Realtek ALC623" },
{ HDA_CODEC_ALC660, 0, "Realtek ALC660-VD" },
{ HDA_CODEC_ALC662, 0x0002, "Realtek ALC662 rev2" },
+ { HDA_CODEC_ALC662, 0x0101, "Realtek ALC662 rev1" },
+ { HDA_CODEC_ALC662, 0x0300, "Realtek ALC662 rev3" },
{ HDA_CODEC_ALC662, 0, "Realtek ALC662" },
{ HDA_CODEC_ALC663, 0, "Realtek ALC663" },
{ HDA_CODEC_ALC665, 0, "Realtek ALC665" },
@@ -140,6 +149,8 @@ static const struct {
{ HDA_CODEC_ALC892, 0, "Realtek ALC892" },
{ HDA_CODEC_ALC899, 0, "Realtek ALC899" },
{ HDA_CODEC_ALC1150, 0, "Realtek ALC1150" },
+ { HDA_CODEC_ALCS1200A, 0, "Realtek ALCS1200A" },
+ { HDA_CODEC_ALC1220_1, 0, "Realtek ALC1220" },
{ HDA_CODEC_ALC1220, 0, "Realtek ALC1220" },
{ HDA_CODEC_AD1882, 0, "Analog Devices AD1882" },
{ HDA_CODEC_AD1882A, 0, "Analog Devices AD1882A" },
@@ -369,6 +380,11 @@ static const struct {
{ HDA_CODEC_INTELBDW, 0, "Intel Broadwell" },
{ HDA_CODEC_INTELSKLK, 0, "Intel Skylake" },
{ HDA_CODEC_INTELKBLK, 0, "Intel Kaby Lake" },
+ { HDA_CODEC_INTELJLK, 0, "Intel Jasper Lake" },
+ { HDA_CODEC_INTELELLK, 0, "Intel Elkhart Lake" },
+ { HDA_CODEC_INTELCT, 0, "Intel CedarTrail" },
+ { 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" },
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
