Author: mav
Date: Fri Dec 11 01:17:49 2009
New Revision: 200382
URL: http://svn.freebsd.org/changeset/base/200382
Log:
MFC r199258, r199846:
Add more codec IDs.
Add two Cirrus Logic codec IDs.
Add GPIO setting quirk for Apple MacBookPro5,5.
Modified:
stable/7/sys/dev/sound/pci/hda/hdac.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/7/sys/dev/sound/pci/hda/hdac.c Fri Dec 11 01:15:53 2009
(r200381)
+++ stable/7/sys/dev/sound/pci/hda/hdac.c Fri Dec 11 01:17:49 2009
(r200382)
@@ -82,7 +82,7 @@
#include "mixer_if.h"
-#define HDA_DRV_TEST_REV "20090929_0137"
+#define HDA_DRV_TEST_REV "20091113_0138"
SND_DECLARE_FILE("$FreeBSD$");
@@ -311,6 +311,7 @@ SND_DECLARE_FILE("$FreeBSD$");
* (see HDA_CODEC_STAC9221 below).
*/
#define APPLE_INTEL_MAC 0x76808384
+#define APPLE_MACBOOKPRO55 0xcb7910de
/* LG Electronics */
#define LG_VENDORID 0x1854
@@ -601,6 +602,11 @@ static const struct {
#define HDA_CODEC_CONSTRUCT(vendor, id) \
(((uint32_t)(vendor##_VENDORID) << 16) | ((id) & 0xffff))
+/* Cirrus Logic */
+#define CIRRUSLOGIC_VENDORID 0x1013
+#define HDA_CODEC_CS4206 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4206)
+#define HDA_CODEC_CS4207 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4207)
+
/* Realtek */
#define REALTEK_VENDORID 0x10ec
#define HDA_CODEC_ALC260 HDA_CODEC_CONSTRUCT(REALTEK, 0x0260)
@@ -760,6 +766,16 @@ static const struct {
#define HDA_CODEC_VT1702_5 HDA_CODEC_CONSTRUCT(VIA, 0x5398)
#define HDA_CODEC_VT1702_6 HDA_CODEC_CONSTRUCT(VIA, 0x6398)
#define HDA_CODEC_VT1702_7 HDA_CODEC_CONSTRUCT(VIA, 0x7398)
+#define HDA_CODEC_VT1716S_0 HDA_CODEC_CONSTRUCT(VIA, 0x0433)
+#define HDA_CODEC_VT1716S_1 HDA_CODEC_CONSTRUCT(VIA, 0xa721)
+#define HDA_CODEC_VT1718S_0 HDA_CODEC_CONSTRUCT(VIA, 0x0428)
+#define HDA_CODEC_VT1718S_1 HDA_CODEC_CONSTRUCT(VIA, 0x4428)
+#define HDA_CODEC_VT1812 HDA_CODEC_CONSTRUCT(VIA, 0x0448)
+#define HDA_CODEC_VT1818S HDA_CODEC_CONSTRUCT(VIA, 0x0440)
+#define HDA_CODEC_VT1828S HDA_CODEC_CONSTRUCT(VIA, 0x4441)
+#define HDA_CODEC_VT2002P_0 HDA_CODEC_CONSTRUCT(VIA, 0x0438)
+#define HDA_CODEC_VT2002P_1 HDA_CODEC_CONSTRUCT(VIA, 0x4438)
+#define HDA_CODEC_VT2020 HDA_CODEC_CONSTRUCT(VIA, 0x0441)
#define HDA_CODEC_VTXXXX HDA_CODEC_CONSTRUCT(VIA, 0xffff)
/* ATI */
@@ -782,6 +798,7 @@ static const struct {
#define HDA_CODEC_INTELG45_2 HDA_CODEC_CONSTRUCT(INTEL, 0x2802)
#define HDA_CODEC_INTELG45_3 HDA_CODEC_CONSTRUCT(INTEL, 0x2803)
#define HDA_CODEC_INTELG45_4 HDA_CODEC_CONSTRUCT(INTEL, 0x29fb)
+#define HDA_CODEC_INTELQ57 HDA_CODEC_CONSTRUCT(INTEL, 0x0054)
#define HDA_CODEC_INTELXXXX HDA_CODEC_CONSTRUCT(INTEL, 0xffff)
/* Codecs */
@@ -789,6 +806,8 @@ static const struct {
uint32_t id;
char *name;
} hdac_codecs[] = {
+ { HDA_CODEC_CS4206, "Cirrus Logic CS4206" },
+ { HDA_CODEC_CS4207, "Cirrus Logic CS4207" },
{ HDA_CODEC_ALC260, "Realtek ALC260" },
{ HDA_CODEC_ALC262, "Realtek ALC262" },
{ HDA_CODEC_ALC267, "Realtek ALC267" },
@@ -913,6 +932,16 @@ static const struct {
{ HDA_CODEC_VT1702_5, "VIA VT1702_5" },
{ HDA_CODEC_VT1702_6, "VIA VT1702_6" },
{ HDA_CODEC_VT1702_7, "VIA VT1702_7" },
+ { HDA_CODEC_VT1716S_0, "VIA VT1716S_0" },
+ { HDA_CODEC_VT1716S_1, "VIA VT1716S_1" },
+ { HDA_CODEC_VT1718S_0, "VIA VT1718S_0" },
+ { HDA_CODEC_VT1718S_1, "VIA VT1718S_1" },
+ { HDA_CODEC_VT1812, "VIA VT1812" },
+ { HDA_CODEC_VT1818S, "VIA VT1818S" },
+ { HDA_CODEC_VT1828S, "VIA VT1828S" },
+ { HDA_CODEC_VT2002P_0, "VIA VT2002P_0" },
+ { HDA_CODEC_VT2002P_1, "VIA VT2002P_1" },
+ { HDA_CODEC_VT2020, "VIA VT2020" },
{ HDA_CODEC_ATIRS600_1,"ATI RS600 HDMI" },
{ HDA_CODEC_ATIRS600_2,"ATI RS600 HDMI" },
{ HDA_CODEC_ATIRS690, "ATI RS690/780 HDMI" },
@@ -926,6 +955,7 @@ static const struct {
{ HDA_CODEC_INTELG45_2, "Intel G45 HDMI" },
{ HDA_CODEC_INTELG45_3, "Intel G45 HDMI" },
{ HDA_CODEC_INTELG45_4, "Intel G45 HDMI" },
+ { HDA_CODEC_INTELQ57, "Intel Q57 HDMI" },
{ HDA_CODEC_SII1390, "Silicon Image SiI1390 HDMI" },
{ HDA_CODEC_SII1392, "Silicon Image SiI1392 HDMI" },
/* Unknown codec */
@@ -4644,6 +4674,8 @@ static const struct {
HDA_QUIRK_GPIO0 | HDA_QUIRK_OVREF50, 0},
{ APPLE_INTEL_MAC, HDA_CODEC_STAC9221,
HDA_QUIRK_GPIO0 | HDA_QUIRK_GPIO1, 0 },
+ { APPLE_MACBOOKPRO55, HDA_CODEC_CS4206,
+ HDA_QUIRK_GPIO1 | HDA_QUIRK_GPIO3, 0 },
{ DELL_D630_SUBVENDOR, HDA_CODEC_STAC9205X,
HDA_QUIRK_GPIO0, 0 },
{ DELL_V1400_SUBVENDOR, HDA_CODEC_STAC9228X,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
