2 files changed, 12 insertions, 3 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 72aff61e7315..6f6d117ac7e2 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1024,6 +1024,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           intel-mac-v3  Intel Mac Type 3
           intel-mac-v4  Intel Mac Type 4
           intel-mac-v5  Intel Mac Type 5
+          intel-mac-auto Intel Mac (detect type according to subsystem id)
           macmini       Intel Mac Mini (equivalent with type 3)
           macbook       Intel Mac Book (eq. type 5)
           macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 08cb77f51880..7fdafcb0015d 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -94,6 +94,9 @@ enum {
         STAC_INTEL_MAC_V3,
         STAC_INTEL_MAC_V4,
         STAC_INTEL_MAC_V5,
+        STAC_INTEL_MAC_AUTO, /* This model is selected if no module parameter
+                              * is given, one of the above models will be
+                              * chosen according to the subsystem id. */
         /* for backward compatibility */
         STAC_MACMINI,
         STAC_MACBOOK,
@@ -1483,6 +1486,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
         [STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs,
         [STAC_INTEL_MAC_V4] = intel_mac_v4_pin_configs,
         [STAC_INTEL_MAC_V5] = intel_mac_v5_pin_configs,
+        [STAC_INTEL_MAC_AUTO] = intel_mac_v3_pin_configs,
         /* for backward compatibility */
         [STAC_MACMINI] = intel_mac_v3_pin_configs,
         [STAC_MACBOOK] = intel_mac_v5_pin_configs,
@@ -1505,6 +1509,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
         [STAC_INTEL_MAC_V3] = "intel-mac-v3",
         [STAC_INTEL_MAC_V4] = "intel-mac-v4",
         [STAC_INTEL_MAC_V5] = "intel-mac-v5",
+        [STAC_INTEL_MAC_AUTO] = "intel-mac-auto",
         /* for backward compatibility */
         [STAC_MACMINI]  = "macmini",
         [STAC_MACBOOK]  = "macbook",
@@ -1576,9 +1581,9 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0707,
                       "Intel D945P", STAC_D945GTP5),
         /* other systems  */
-        /* Apple Mac Mini (early 2006) */
+        /* Apple Intel Mac (Mac Mini, MacBook, MacBook Pro...) */
         SND_PCI_QUIRK(0x8384, 0x7680,
-                      "Mac Mini", STAC_INTEL_MAC_V3),
+                      "Mac", STAC_INTEL_MAC_AUTO),
         /* Dell systems  */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,
                       "unknown Dell", STAC_922X_DELL_D81),
@@ -3725,7 +3730,7 @@ static int patch_stac922x(struct hda_codec *codec)
         spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
                                                         stac922x_models,
                                                         stac922x_cfg_tbl);
-        if (spec->board_config == STAC_INTEL_MAC_V3) {
+        if (spec->board_config == STAC_INTEL_MAC_AUTO) {
                 spec->gpio_mask = spec->gpio_dir = 0x03;
                 spec->gpio_data = 0x03;
                 /* Intel Macs have all same PCI SSID, so we need to check
@@ -3757,6 +3762,9 @@ static int patch_stac922x(struct hda_codec *codec)
                 case 0x106b2200:
                         spec->board_config = STAC_INTEL_MAC_V5;
                         break;
+                default:
+                        spec->board_config = STAC_INTEL_MAC_V3;
+                        break;
                 }
         }