1 files changed, 36 insertions, 47 deletions

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index b25fb65b240e..a0d3c16b68ec 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.49
+ * Version 3.50
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -422,67 +422,40 @@ static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
-        int i;
-
         hwif->set_pio_mode = &via_set_pio_mode;
         hwif->set_dma_mode = &via_set_drive;
 
-#ifdef CONFIG_PPC_CHRP
-        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
-                hwif->irq = hwif->channel ? 15 : 14;
-        }
-#endif
-
-        for (i = 0; i < 2; i++) {
-                hwif->drives[i].io_32bit = 1;
-                hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
-                hwif->drives[i].autotune = 1;
-        }
-
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
-
-        hwif->ultra_mask = vdev->via_config->udma_mask;
-        hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
-
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = via82cxxx_cable_detect(hwif);
 }
 
-static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
-        {       /* 0 */
-                .name           = "VP_IDE",
-                .init_chipset   = init_chipset_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
-                .autodma        = NOAUTODMA,
-                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-                .bootable       = ON_BOARD,
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
-                                | IDE_HFLAG_PIO_NO_DOWNGRADE
-                                | IDE_HFLAG_POST_SET_MODE,
-                .pio_mask       = ATA_PIO5,
-        },{     /* 1 */
-                .name           = "VP_IDE",
-                .init_chipset   = init_chipset_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
-                .autodma        = AUTODMA,
-                .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-                .bootable       = ON_BOARD,
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
-                                | IDE_HFLAG_PIO_NO_DOWNGRADE
-                                | IDE_HFLAG_POST_SET_MODE,
-                .pio_mask       = ATA_PIO5,
-        }
+static const struct ide_port_info via82cxxx_chipset __devinitdata = {
+        .name           = "VP_IDE",
+        .init_chipset   = init_chipset_via82cxxx,
+        .init_hwif      = init_hwif_via82cxxx,
+        .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
+        .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
+                          IDE_HFLAG_PIO_NO_DOWNGRADE |
+                          IDE_HFLAG_POST_SET_MODE |
+                          IDE_HFLAG_IO_32BIT |
+                          IDE_HFLAG_BOOTABLE,
+        .pio_mask       = ATA_PIO5,
+        .swdma_mask     = ATA_SWDMA2,
+        .mwdma_mask     = ATA_MWDMA2,
 };
 
 static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct pci_dev *isa = NULL;
         struct via_isa_bridge *via_config;
+        u8 idx = id->driver_data;
+        struct ide_port_info d;
+
+        d = via82cxxx_chipset;
+
         /*
          * Find the ISA bridge and check we know what it is.
          */
@@ -492,7 +465,23 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
                 printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
                 return -ENODEV;
         }
-        return ide_setup_pci_device(dev, &via82cxxx_chipsets[id->driver_data]);
+
+        if (idx == 0)
+                d.host_flags |= IDE_HFLAG_NO_AUTODMA;
+        else
+                d.enablebits[1].reg = d.enablebits[0].reg = 0;
+
+        if ((via_config->flags & VIA_NO_UNMASK) == 0)
+                d.host_flags |= IDE_HFLAG_UNMASK_IRQS;
+
+#ifdef CONFIG_PPC_CHRP
+        if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos)
+                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
+#endif
+
+        d.udma_mask = via_config->udma_mask;
+
+        return ide_setup_pci_device(dev, &d);
 }
 
 static const struct pci_device_id via_pci_tbl[] = {