Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_cirrus.c
index 72c1b56b64d9d9874bf3c00a374eb11d90f6c3dc..8ba306856d38f649249de71ea33d999518294c09 100644 (file)
@@ -65,9 +65,7 @@ struct cs_spec {
 
 /* available models */
 enum {
-       CS420X_MBP53,
        CS420X_MBP55,
-       CS420X_IMAC27,
        CS420X_AUTO,
        CS420X_MODELS
 };
@@ -834,9 +832,7 @@ static void cs_automute(struct hda_codec *codec)
                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
                                    hp_present ? 0 : PIN_OUT);
        }
-       if (spec->board_config == CS420X_MBP53 ||
-           spec->board_config == CS420X_MBP55 ||
-           spec->board_config == CS420X_IMAC27) {
+       if (spec->board_config == CS420X_MBP55) {
                unsigned int gpio = hp_present ? 0x02 : 0x08;
                snd_hda_codec_write(codec, 0x01, 0,
                                    AC_VERB_SET_GPIO_DATA, gpio);
@@ -1081,19 +1077,13 @@ static int cs_parse_auto_config(struct hda_codec *codec)
 }
 
 static const char *cs420x_models[CS420X_MODELS] = {
-       [CS420X_MBP53] = "mbp53",
        [CS420X_MBP55] = "mbp55",
-       [CS420X_IMAC27] = "imac27",
        [CS420X_AUTO] = "auto",
 };
 
 
 static struct snd_pci_quirk cs420x_cfg_tbl[] = {
-       SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
-       SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
        SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
-       SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
-       SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
        {} /* terminator */
 };
 
@@ -1102,20 +1092,6 @@ struct cs_pincfg {
        u32 val;
 };
 
-static struct cs_pincfg mbp53_pincfgs[] = {
-       { 0x09, 0x012b4050 },
-       { 0x0a, 0x90100141 },
-       { 0x0b, 0x90100140 },
-       { 0x0c, 0x018b3020 },
-       { 0x0d, 0x90a00110 },
-       { 0x0e, 0x400000f0 },
-       { 0x0f, 0x01cbe030 },
-       { 0x10, 0x014be060 },
-       { 0x12, 0x400000f0 },
-       { 0x15, 0x400000f0 },
-       {} /* terminator */
-};
-
 static struct cs_pincfg mbp55_pincfgs[] = {
        { 0x09, 0x012b4030 },
        { 0x0a, 0x90100121 },
@@ -1130,24 +1106,8 @@ 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_MBP53] = mbp53_pincfgs,
        [CS420X_MBP55] = mbp55_pincfgs,
-       [CS420X_IMAC27] = imac27_pincfgs,
 };
 
 static void fix_pincfg(struct hda_codec *codec, int model)
@@ -1177,8 +1137,6 @@ static int patch_cs420x(struct hda_codec *codec)
                fix_pincfg(codec, spec->board_config);
 
        switch (spec->board_config) {
-       case CS420X_IMAC27:
-       case CS420X_MBP53:
        case CS420X_MBP55:
                /* GPIO1 = headphones */
                /* GPIO3 = speakers */