svn commit: r261792 - stable/10/sys/dev/sound/pci/hda

[Hans Petter Selasky]

Author: hselasky
Date: Wed Feb 12 07:18:01 2014
New Revision: 261792
URL: http://svnweb.freebsd.org/changeset/base/261792

Log:
  MFC r261507:
  Add more quirks for making builtin audio speakers work with more
  MacBookPro's. Only tested with MacBookPro 9,2.
  
  Obtained from:	Linux

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

Modified: stable/10/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Feb 12 04:56:34 2014	(r261791)
+++ stable/10/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Feb 12 07:18:01 2014	(r261792)
@@ -107,9 +107,18 @@ static const struct {
 	{ APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDA_MATCH_ALL,
 	    0, 0,
 	    HDAA_GPIO_SET(0) | HDAA_GPIO_SET(1) },
+	{ APPLE_MACBOOKAIR31, HDA_CODEC_CS4206, HDA_MATCH_ALL,
+	    0, 0,
+	    HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) },
 	{ APPLE_MACBOOKPRO55, HDA_CODEC_CS4206, HDA_MATCH_ALL,
 	    0, 0,
 	    HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) },
+	{ APPLE_MACBOOKPRO71, HDA_CODEC_CS4206, HDA_MATCH_ALL,
+	    0, 0,
+	    HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) },
+	{ HDA_INTEL_MACBOOKPRO92, HDA_CODEC_CS4206, HDA_MATCH_ALL,
+	    0, 0,
+	    HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) },
 	{ DELL_D630_SUBVENDOR, HDA_CODEC_STAC9205X, HDA_MATCH_ALL,
 	    0, 0,
 	    HDAA_GPIO_SET(0) },

Modified: stable/10/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdac.h	Wed Feb 12 04:56:34 2014	(r261791)
+++ stable/10/sys/dev/sound/pci/hda/hdac.h	Wed Feb 12 07:18:01 2014	(r261792)
@@ -58,6 +58,7 @@
 #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_MACBOOKPRO92	HDA_MODEL_CONSTRUCT(INTEL, 0x7270)
 #define HDA_INTEL_SCH		HDA_MODEL_CONSTRUCT(INTEL, 0x811b)
 #define HDA_INTEL_LPT1		HDA_MODEL_CONSTRUCT(INTEL, 0x8c20)
 #define HDA_INTEL_LPT2		HDA_MODEL_CONSTRUCT(INTEL, 0x8c21)
@@ -266,7 +267,9 @@
  * (see HDA_CODEC_STAC9221 below).
  */
 #define APPLE_INTEL_MAC		0x76808384
+#define APPLE_MACBOOKAIR31	0x0d9410de
 #define APPLE_MACBOOKPRO55	0xcb7910de
+#define APPLE_MACBOOKPRO71	0xcb8910de
 
 /* LG Electronics */
 #define LG_VENDORID		0x1854