4 files changed, 9 insertions, 368 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index c6ef9d0cf370..6bdedd7cca2c 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -831,6 +831,7 @@ config PATA_OF_PLATFORM
 config PATA_QDI
         tristate "QDI VLB PATA support"
         depends on ISA
+        select PATA_LEGACY
         help
           Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
 
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 9550d691fd19..6ece5b7231a3 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -88,7 +88,6 @@ obj-$(CONFIG_PATA_PCMCIA)	+= pata_pcmcia.o
 obj-$(CONFIG_PATA_PALMLD)       += pata_palmld.o
 obj-$(CONFIG_PATA_PLATFORM)     += pata_platform.o
 obj-$(CONFIG_PATA_OF_PLATFORM)  += pata_of_platform.o
-obj-$(CONFIG_PATA_QDI)          += pata_qdi.o
 obj-$(CONFIG_PATA_RB532)        += pata_rb532_cf.o
 obj-$(CONFIG_PATA_RZ1000)       += pata_rz1000.o
 obj-$(CONFIG_PATA_SAMSUNG_CF)   += pata_samsung_cf.o
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index d960f8e9e8b1..e71fdfbf69b3 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -137,11 +137,17 @@ static int ht6560a;		/* HT 6560A on primary 1, second 2, both 3 */
 static int ht6560b;             /* HT 6560A on primary 1, second 2, both 3 */
 static int opti82c611a;         /* Opti82c611A on primary 1, sec 2, both 3 */
 static int opti82c46x;          /* Opti 82c465MV present(pri/sec autodetect) */
-static int qdi;                 /* Set to probe QDI controllers */
 static int autospeed;           /* Chip present which snoops speed changes */
 static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */
 static int iordy_mask = 0xFFFFFFFF;     /* Use iordy if available */
 
+/* Set to probe QDI controllers */
+#ifdef CONFIG_PATA_QDI_MODULE
+static int qdi = 1;
+#else
+static int qdi;
+#endif
+
 #ifdef CONFIG_PATA_WINBOND_VLB_MODULE
 static int winbond = 1;         /* Set to probe Winbond controllers,
                                         give I/O port if non standard */
@@ -1306,6 +1312,7 @@ MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for legacy ATA");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("pata_qdi");
 MODULE_ALIAS("pata_winbond");
 
 module_param(probe_all, int, 0);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
deleted file mode 100644
index 45879dc6fa41..000000000000
--- a/drivers/ata/pata_qdi.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *    pata_qdi.c - QDI VLB ATA controllers
- *      (C) 2006 Red Hat
- *
- * This driver mostly exists as a proof of concept for non PCI devices under
- * libata. While the QDI6580 was 'neat' in 1993 it is no longer terribly
- * useful.
- *
- * Tuning code written from the documentation at
- * http://www.ryston.cz/petr/vlb/qd6500.html
- * http://www.ryston.cz/petr/vlb/qd6580.html
- *
- * Probe code based on drivers/ide/legacy/qd65xx.c
- * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by
- * Samuel Thibault <samuel.thibault@ens-lyon.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <scsi/scsi_host.h>
-#include <linux/libata.h>
-#include <linux/platform_device.h>
-
-#define DRV_NAME "pata_qdi"
-#define DRV_VERSION "0.3.1"
-
-#define NR_HOST 4       /* Two 6580s */
-
-struct qdi_data {
-        unsigned long timing;
-        u8 clock[2];
-        u8 last;
-        int fast;
-        struct platform_device *platform_dev;
-
-};
-
-static struct ata_host *qdi_host[NR_HOST];
-static struct qdi_data qdi_data[NR_HOST];
-static int nr_qdi_host;
-
-#ifdef MODULE
-static int probe_qdi = 1;
-#else
-static int probe_qdi;
-#endif
-
-static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
-{
-        struct ata_timing t;
-        struct qdi_data *qdi = ap->host->private_data;
-        int active, recovery;
-        u8 timing;
-
-        /* Get the timing data in cycles */
-        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
-
-        if (qdi->fast) {
-                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - clamp_val(t.recover, 3, 18);
-        } else {
-                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - clamp_val(t.recover, 0, 15);
-        }
-        timing = (recovery << 4) | active | 0x08;
-
-        qdi->clock[adev->devno] = timing;
-
-        outb(timing, qdi->timing);
-}
-
-static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
-{
-        struct ata_timing t;
-        struct qdi_data *qdi = ap->host->private_data;
-        int active, recovery;
-        u8 timing;
-
-        /* Get the timing data in cycles */
-        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
-
-        if (qdi->fast) {
-                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - clamp_val(t.recover, 3, 18);
-        } else {
-                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - clamp_val(t.recover, 0, 15);
-        }
-        timing = (recovery << 4) | active | 0x08;
-
-        qdi->clock[adev->devno] = timing;
-
-        outb(timing, qdi->timing);
-
-        /* Clear the FIFO */
-        if (adev->class != ATA_DEV_ATA)
-                outb(0x5F, (qdi->timing & 0xFFF0) + 3);
-}
-
-/**
- *      qdi_qc_issue            -       command issue
- *      @qc: command pending
- *
- *      Called when the libata layer is about to issue a command. We wrap
- *      this interface so that we can load the correct ATA timings.
- */
-
-static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)
-{
-        struct ata_port *ap = qc->ap;
-        struct ata_device *adev = qc->dev;
-        struct qdi_data *qdi = ap->host->private_data;
-
-        if (qdi->clock[adev->devno] != qdi->last) {
-                if (adev->pio_mode) {
-                        qdi->last = qdi->clock[adev->devno];
-                        outb(qdi->clock[adev->devno], qdi->timing);
-                }
-        }
-        return ata_sff_qc_issue(qc);
-}
-
-static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
-                                  unsigned int buflen, int rw)
-{
-        if (ata_id_has_dword_io(dev->id)) {
-                struct ata_port *ap = dev->link->ap;
-                int slop = buflen & 3;
-
-                if (rw == READ)
-                        ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
-                else
-                        iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
-
-                if (unlikely(slop)) {
-                        __le32 pad;
-                        if (rw == READ) {
-                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                                memcpy(buf + buflen - slop, &pad, slop);
-                        } else {
-                                memcpy(&pad, buf + buflen - slop, slop);
-                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
-                        }
-                        buflen += 4 - slop;
-                }
-        } else
-                buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
-
-        return buflen;
-}
-
-static struct scsi_host_template qdi_sht = {
-        ATA_PIO_SHT(DRV_NAME),
-};
-
-static struct ata_port_operations qdi6500_port_ops = {
-        .inherits       = &ata_sff_port_ops,
-        .qc_issue       = qdi_qc_issue,
-        .sff_data_xfer  = qdi_data_xfer,
-        .cable_detect   = ata_cable_40wire,
-        .set_piomode    = qdi6500_set_piomode,
-};
-
-static struct ata_port_operations qdi6580_port_ops = {
-        .inherits       = &qdi6500_port_ops,
-        .set_piomode    = qdi6580_set_piomode,
-};
-
-/**
- *      qdi_init_one            -       attach a qdi interface
- *      @type: Type to display
- *      @io: I/O port start
- *      @irq: interrupt line
- *      @fast: True if on a > 33Mhz VLB
- *
- *      Register an ISA bus IDE interface. Such interfaces are PIO and we
- *      assume do not support IRQ sharing.
- */
-
-static __init int qdi_init_one(unsigned long port, int type, unsigned long io, int irq, int fast)
-{
-        unsigned long ctl = io + 0x206;
-        struct platform_device *pdev;
-        struct ata_host *host;
-        struct ata_port *ap;
-        void __iomem *io_addr, *ctl_addr;
-        int ret;
-
-        /*
-         *      Fill in a probe structure first of all
-         */
-
-        pdev = platform_device_register_simple(DRV_NAME, nr_qdi_host, NULL, 0);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
-
-        ret = -ENOMEM;
-        io_addr = devm_ioport_map(&pdev->dev, io, 8);
-        ctl_addr = devm_ioport_map(&pdev->dev, ctl, 1);
-        if (!io_addr || !ctl_addr)
-                goto fail;
-
-        ret = -ENOMEM;
-        host = ata_host_alloc(&pdev->dev, 1);
-        if (!host)
-                goto fail;
-        ap = host->ports[0];
-
-        if (type == 6580) {
-                ap->ops = &qdi6580_port_ops;
-                ap->pio_mask = ATA_PIO4;
-                ap->flags |= ATA_FLAG_SLAVE_POSS;
-        } else {
-                ap->ops = &qdi6500_port_ops;
-                ap->pio_mask = ATA_PIO2; /* Actually PIO3 !IORDY is possible */
-                ap->flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_IORDY;
-        }
-
-        ap->ioaddr.cmd_addr = io_addr;
-        ap->ioaddr.altstatus_addr = ctl_addr;
-        ap->ioaddr.ctl_addr = ctl_addr;
-        ata_sff_std_ports(&ap->ioaddr);
-
-        ata_port_desc(ap, "cmd %lx ctl %lx", io, ctl);
-
-        /*
-         *      Hook in a private data structure per channel
-         */
-        ap->private_data = &qdi_data[nr_qdi_host];
-
-        qdi_data[nr_qdi_host].timing = port;
-        qdi_data[nr_qdi_host].fast = fast;
-        qdi_data[nr_qdi_host].platform_dev = pdev;
-
-        printk(KERN_INFO DRV_NAME": qd%d at 0x%lx.\n", type, io);
-
-        /* activate */
-        ret = ata_host_activate(host, irq, ata_sff_interrupt, 0, &qdi_sht);
-        if (ret)
-                goto fail;
-
-        qdi_host[nr_qdi_host++] = dev_get_drvdata(&pdev->dev);
-        return 0;
-
- fail:
-        platform_device_unregister(pdev);
-        return ret;
-}
-
-/**
- *      qdi_init                -       attach qdi interfaces
- *
- *      Attach qdi IDE interfaces by scanning the ports it may occupy.
- */
-
-static __init int qdi_init(void)
-{
-        unsigned long flags;
-        static const unsigned long qd_port[2] = { 0x30, 0xB0 };
-        static const unsigned long ide_port[2] = { 0x170, 0x1F0 };
-        static const int ide_irq[2] = { 14, 15 };
-
-        int ct = 0;
-        int i;
-
-        if (probe_qdi == 0)
-                return -ENODEV;
-
-        /*
-         *      Check each possible QD65xx base address
-         */
-
-        for (i = 0; i < 2; i++) {
-                unsigned long port = qd_port[i];
-                u8 r, res;
-
-
-                if (request_region(port, 2, "pata_qdi")) {
-                        /* Check for a card */
-                        local_irq_save(flags);
-                        r = inb_p(port);
-                        outb_p(0x19, port);
-                        res = inb_p(port);
-                        outb_p(r, port);
-                        local_irq_restore(flags);
-
-                        /* Fail */
-                        if (res == 0x19)
-                        {
-                                release_region(port, 2);
-                                continue;
-                        }
-
-                        /* Passes the presence test */
-                        r = inb_p(port + 1);    /* Check port agrees with port set */
-                        if ((r & 2) >> 1 != i) {
-                                release_region(port, 2);
-                                continue;
-                        }
-
-                        /* Check card type */
-                        if ((r & 0xF0) == 0xC0) {
-                                /* QD6500: single channel */
-                                if (r & 8) {
-                                        /* Disabled ? */
-                                        release_region(port, 2);
-                                        continue;
-                                }
-                                if (qdi_init_one(port, 6500, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0)
-                                        ct++;
-                        }
-                        if (((r & 0xF0) == 0xA0) || (r & 0xF0) == 0x50) {
-                                /* QD6580: dual channel */
-                                if (!request_region(port + 2 , 2, "pata_qdi"))
-                                {
-                                        release_region(port, 2);
-                                        continue;
-                                }
-                                res = inb(port + 3);
-                                if (res & 1) {
-                                        /* Single channel mode */
-                                        if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0)
-                                                ct++;
-                                } else {
-                                        /* Dual channel mode */
-                                        if (qdi_init_one(port, 6580, 0x1F0, 14, r & 0x04) == 0)
-                                                ct++;
-                                        if (qdi_init_one(port + 2, 6580, 0x170, 15, r & 0x04) == 0)
-                                                ct++;
-                                }
-                        }
-                }
-        }
-        if (ct != 0)
-                return 0;
-        return -ENODEV;
-}
-
-static __exit void qdi_exit(void)
-{
-        int i;
-
-        for (i = 0; i < nr_qdi_host; i++) {
-                ata_host_detach(qdi_host[i]);
-                /* Free the control resource. The 6580 dual channel has the resources
-                 * claimed as a pair of 2 byte resources so we need no special cases...
-                 */
-                release_region(qdi_data[i].timing, 2);
-                platform_device_unregister(qdi_data[i].platform_dev);
-        }
-}
-
-MODULE_AUTHOR("Alan Cox");
-MODULE_DESCRIPTION("low-level driver for qdi ATA");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-module_init(qdi_init);
-module_exit(qdi_exit);
-
-module_param(probe_qdi, int, 0);
-