Merge commit 'v3.2-rc6' into fbdev-next

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index b59d04c72051..1892e81fb00f 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -331,7 +331,7 @@ static const struct ide_port_ops ich_port_ops = {
                 .udma_mask      = udma,                 \
         }
 
-#define DECLARE_ICH_DEV(udma) \
+#define DECLARE_ICH_DEV(mwdma, udma) \
         { \
                 .name           = DRV_NAME, \
                 .init_chipset   = init_chipset_ich, \
@@ -340,7 +340,7 @@ static const struct ide_port_ops ich_port_ops = {
                 .port_ops       = &ich_port_ops, \
                 .pio_mask       = ATA_PIO4, \
                 .swdma_mask     = ATA_SWDMA2_ONLY, \
-                .mwdma_mask     = ATA_MWDMA12_ONLY, \
+                .mwdma_mask     = mwdma, \
                 .udma_mask      = udma, \
         }
 
@@ -362,13 +362,15 @@ static const struct ide_port_info piix_pci_info[] __devinitdata = {
         /* 2: PIIX4 */
         DECLARE_PIIX_DEV(ATA_UDMA2),
         /* 3: ICH0 */
-        DECLARE_ICH_DEV(ATA_UDMA2),
+        DECLARE_ICH_DEV(ATA_MWDMA12_ONLY, ATA_UDMA2),
         /* 4: ICH */
-        DECLARE_ICH_DEV(ATA_UDMA4),
+        DECLARE_ICH_DEV(ATA_MWDMA12_ONLY, ATA_UDMA4),
         /* 5: PIIX4 */
         DECLARE_PIIX_DEV(ATA_UDMA4),
-        /* 6: ICH[2-7]/ICH[2-3]M/C-ICH/ICH5-SATA/ESB2/ICH8M */
-        DECLARE_ICH_DEV(ATA_UDMA5),
+        /* 6: ICH[2-6]/ICH[2-3]M/C-ICH/ICH5-SATA/ESB2/ICH8M */
+        DECLARE_ICH_DEV(ATA_MWDMA12_ONLY, ATA_UDMA5),
+        /* 7: ICH7/7-R, no MWDMA1 */
+        DECLARE_ICH_DEV(ATA_MWDMA2_ONLY, ATA_UDMA5),
 };
 
 /**
@@ -438,9 +440,9 @@ static const struct pci_device_id piix_pci_tbl[] = {
 #endif
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB_2),      6 },
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH6_19),    6 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH7_21),    6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH7_21),    7 },
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_1),  6 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB2_18),    6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB2_18),    7 },
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH8_6),     6 },
         { 0, },
 };