MIPS: TXx9: Add TX4939 SoC support

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-generic.c

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 2d92214096ab9fca7b1e5f85865757366a57a97d..8fe8b5b9cf7d7a1e6c7b70e60ed293d2178d57d2 100644 (file)
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -20,6 +20,11 @@
 #include <linux/module.h>
 #include <linux/ide.h>
 
+/* FIXME: convert m32r to use ide_platform host driver */
+#ifdef CONFIG_M32R
+#include <asm/m32r.h>
+#endif
+
 #define DRV_NAME       "ide_generic"
 
 static int probe_mask = 0x03;
@@ -28,29 +33,21 @@ MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports");
 
 static ssize_t store_add(struct class *cls, const char *buf, size_t n)
 {
-       ide_hwif_t *hwif;
        unsigned int base, ctl;
-       int irq;
-       hw_regs_t hw;
-       u8 idx[] = { 0xff, 0xff, 0xff, 0xff };
+       int irq, rc;
+       hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
        if (sscanf(buf, "%x:%x:%d", &base, &ctl, &irq) != 3)
                return -EINVAL;
 
-       hwif = ide_find_port();
-       if (hwif == NULL)
-               return -ENOENT;
-
        memset(&hw, 0, sizeof(hw));
        ide_std_init_ports(&hw, base, ctl);
        hw.irq = irq;
        hw.chipset = ide_generic;
 
-       ide_init_port_hw(hwif, &hw);
-
-       idx[0] = hwif->index;
-
-       ide_device_add(idx, NULL);
+       rc = ide_host_add(NULL, hws, NULL);
+       if (rc)
+               return rc;
 
        return n;
 };
@@ -88,20 +85,41 @@ static int __init ide_generic_sysfs_init(void)
        return 0;
 }
 
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+       || defined(CONFIG_PLAT_OPSPUT)
+static const u16 legacy_bases[] = { 0x1f0 };
+static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ };
+#elif defined(CONFIG_PLAT_MAPPI3)
+static const u16 legacy_bases[] = { 0x1f0, 0x170 };
+static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ };
+#elif defined(CONFIG_ALPHA)
+static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 };
+static const int legacy_irqs[]  = { 14, 15, 11, 10 };
+#else
+static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 };
+static const int legacy_irqs[]  = { 14, 15, 11, 10, 8, 12 };
+#endif
+
 static int __init ide_generic_init(void)
 {
-       u8 idx[MAX_HWIFS];
-       int i;
-
+       hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS];
+       struct ide_host *host;
+       unsigned long io_addr;
+       int i, rc;
+
+#ifdef CONFIG_MIPS
+       if (!ide_probe_legacy())
+               return -ENODEV;
+#endif
        printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
                         "parameter for probing all legacy ISA IDE ports\n");
 
-       for (i = 0; i < MAX_HWIFS; i++) {
-               ide_hwif_t *hwif;
-               unsigned long io_addr = ide_default_io_base(i);
-               hw_regs_t hw;
+       memset(hws, 0, sizeof(hw_regs_t *) * MAX_HWIFS);
+
+       for (i = 0; i < ARRAY_SIZE(legacy_bases); i++) {
+               io_addr = legacy_bases[i];
 
-               idx[i] = 0xff;
+               hws[i] = NULL;
 
                if ((probe_mask & (1 << i)) && io_addr) {
                        if (!request_region(io_addr, 8, DRV_NAME)) {
@@ -119,33 +137,46 @@ static int __init ide_generic_init(void)
                                continue;
                        }
 
-                       /*
-                        * Skip probing if the corresponding
-                        * slot is already occupied.
-                        */
-                       hwif = ide_find_port();
-                       if (hwif == NULL || hwif->index != i) {
-                               idx[i] = 0xff;
-                               continue;
-                       }
+                       memset(&hw[i], 0, sizeof(hw[i]));
+                       ide_std_init_ports(&hw[i], io_addr, io_addr + 0x206);
+#ifdef CONFIG_IA64
+                       hw[i].irq = isa_irq_to_vector(legacy_irqs[i]);
+#else
+                       hw[i].irq = legacy_irqs[i];
+#endif
+                       hw[i].chipset = ide_generic;
 
-                       memset(&hw, 0, sizeof(hw));
-                       ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
-                       hw.irq = ide_default_irq(io_addr);
-                       hw.chipset = ide_generic;
-                       ide_init_port_hw(hwif, &hw);
-
-                       idx[i] = i;
+                       hws[i] = &hw[i];
                }
        }
 
-       ide_device_add_all(idx, NULL);
+       host = ide_host_alloc_all(NULL, hws);
+       if (host == NULL) {
+               rc = -ENOMEM;
+               goto err;
+       }
+
+       rc = ide_host_register(host, NULL, hws);
+       if (rc)
+               goto err_free;
 
        if (ide_generic_sysfs_init())
                printk(KERN_ERR DRV_NAME ": failed to create ide_generic "
                                         "class\n");
 
        return 0;
+err_free:
+       ide_host_free(host);
+err:
+       for (i = 0; i < MAX_HWIFS; i++) {
+               if (hws[i] == NULL)
+                       continue;
+
+               io_addr = hws[i]->io_ports.data_addr;
+               release_region(io_addr + 0x206, 1);
+               release_region(io_addr, 8);
+       }
+       return rc;
 }
 
 module_init(ide_generic_init);