Merge branch 'fix/hda' into topic/hda

1 files changed, 21 insertions, 1 deletions

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index eeb91f6a06c..093cfbb55e9 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -66,6 +66,7 @@ struct cs_spec {
 /* available models */
 enum {
         CS420X_MBP55,
+        CS420X_IMAC27,
         CS420X_AUTO,
         CS420X_MODELS
 };
@@ -833,7 +834,8 @@ static void cs_automute(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL,
                                     hp_present ? 0 : PIN_OUT);
         }
-        if (spec->board_config == CS420X_MBP55) {
+        if (spec->board_config == CS420X_MBP55 ||
+            spec->board_config == CS420X_IMAC27) {
                 unsigned int gpio = hp_present ? 0x02 : 0x08;
                 snd_hda_codec_write(codec, 0x01, 0,
                                     AC_VERB_SET_GPIO_DATA, gpio);
@@ -1075,12 +1077,14 @@ static int cs_parse_auto_config(struct hda_codec *codec)
 
 static const char *cs420x_models[CS420X_MODELS] = {
         [CS420X_MBP55] = "mbp55",
+        [CS420X_IMAC27] = "imac27",
         [CS420X_AUTO] = "auto",
 };
 
 
 static struct snd_pci_quirk cs420x_cfg_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
+        SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
         {} /* terminator */
 };
 
@@ -1103,8 +1107,23 @@ static struct cs_pincfg mbp55_pincfgs[] = {
         {} /* terminator */
 };
 
+static struct cs_pincfg imac27_pincfgs[] = {
+        { 0x09, 0x012b4050 },
+        { 0x0a, 0x90100140 },
+        { 0x0b, 0x90100142 },
+        { 0x0c, 0x018b3020 },
+        { 0x0d, 0x90a00110 },
+        { 0x0e, 0x400000f0 },
+        { 0x0f, 0x01cbe030 },
+        { 0x10, 0x014be060 },
+        { 0x12, 0x01ab9070 },
+        { 0x15, 0x400000f0 },
+        {} /* terminator */
+};
+
 static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
         [CS420X_MBP55] = mbp55_pincfgs,
+        [CS420X_IMAC27] = imac27_pincfgs,
 };
 
 static void fix_pincfg(struct hda_codec *codec, int model)
@@ -1134,6 +1153,7 @@ static int patch_cs420x(struct hda_codec *codec)
                 fix_pincfg(codec, spec->board_config);
 
         switch (spec->board_config) {
+        case CS420X_IMAC27:
         case CS420X_MBP55:
                 /* GPIO1 = headphones */
                 /* GPIO3 = speakers */