From 0c43daaa5ef6559ac521004483befa2717ff525e Mon Sep 17 00:00:00 2001
From: mav <mav@FreeBSD.org>
Date: Thu, 26 Nov 2009 20:25:57 +0000
Subject: [PATCH] Add two Cirrus Logic codec IDs. Add GPIO setting quirk for
 Apple MacBookPro5,5.

Submitted by:	ed
---
 sys/dev/sound/pci/hda/hdac.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index c88036955a97..61bc646a035e 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -315,6 +315,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
@@ -605,6 +606,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)
@@ -804,6 +810,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" },
@@ -4667,6 +4675,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,