MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.

The patch needs to eliminate the definition of OCTEON_IRQ_BOOTDMA so
that the device tree code can map the interrupt, so in order to not
temporarily break things, we do a single patch to both the interrupt
registration code and the pata_octeon_cf driver.

Also rolled in is a conversion to use hrtimers and corrections to the
timing calculations.

Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David Daney <david.daney@cavium.com>

2 files changed, 0 insertions, 103 deletions

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 02b15eed4bcd..46f5dbceeecc 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1266,7 +1266,6 @@ static void __init octeon_irq_init_ciu(void)
                 octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_TIMER0, 0, i + 52);
 
         octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);
-        octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_BOOTDMA, 0, 63);
 
         /* CIU_1 */
         for (i = 0; i < 16; i++)
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index 0938df10a71c..3c1b625a5859 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -24,108 +24,6 @@
 #include <asm/octeon/cvmx-helper.h>
 #include <asm/octeon/cvmx-helper-board.h>
 
-static struct octeon_cf_data octeon_cf_data;
-
-static int __init octeon_cf_device_init(void)
-{
-        union cvmx_mio_boot_reg_cfgx mio_boot_reg_cfg;
-        unsigned long base_ptr, region_base, region_size;
-        struct platform_device *pd;
-        struct resource cf_resources[3];
-        unsigned int num_resources;
-        int i;
-        int ret = 0;
-
-        /* Setup octeon-cf platform device if present. */
-        base_ptr = 0;
-        if (octeon_bootinfo->major_version == 1
-                && octeon_bootinfo->minor_version >= 1) {
-                if (octeon_bootinfo->compact_flash_common_base_addr)
-                        base_ptr =
-                                octeon_bootinfo->compact_flash_common_base_addr;
-        } else {
-                base_ptr = 0x1d000800;
-        }
-
-        if (!base_ptr)
-                return ret;
-
-        /* Find CS0 region. */
-        for (i = 0; i < 8; i++) {
-                mio_boot_reg_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(i));
-                region_base = mio_boot_reg_cfg.s.base << 16;
-                region_size = (mio_boot_reg_cfg.s.size + 1) << 16;
-                if (mio_boot_reg_cfg.s.en && base_ptr >= region_base
-                    && base_ptr < region_base + region_size)
-                        break;
-        }
-        if (i >= 7) {
-                /* i and i + 1 are CS0 and CS1, both must be less than 8. */
-                goto out;
-        }
-        octeon_cf_data.base_region = i;
-        octeon_cf_data.is16bit = mio_boot_reg_cfg.s.width;
-        octeon_cf_data.base_region_bias = base_ptr - region_base;
-        memset(cf_resources, 0, sizeof(cf_resources));
-        num_resources = 0;
-        cf_resources[num_resources].flags       = IORESOURCE_MEM;
-        cf_resources[num_resources].start       = region_base;
-        cf_resources[num_resources].end = region_base + region_size - 1;
-        num_resources++;
-
-
-        if (!(base_ptr & 0xfffful)) {
-                /*
-                 * Boot loader signals availability of DMA (true_ide
-                 * mode) by setting low order bits of base_ptr to
-                 * zero.
-                 */
-
-                /* Assume that CS1 immediately follows. */
-                mio_boot_reg_cfg.u64 =
-                        cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(i + 1));
-                region_base = mio_boot_reg_cfg.s.base << 16;
-                region_size = (mio_boot_reg_cfg.s.size + 1) << 16;
-                if (!mio_boot_reg_cfg.s.en)
-                        goto out;
-
-                cf_resources[num_resources].flags       = IORESOURCE_MEM;
-                cf_resources[num_resources].start       = region_base;
-                cf_resources[num_resources].end = region_base + region_size - 1;
-                num_resources++;
-
-                octeon_cf_data.dma_engine = 0;
-                cf_resources[num_resources].flags       = IORESOURCE_IRQ;
-                cf_resources[num_resources].start       = OCTEON_IRQ_BOOTDMA;
-                cf_resources[num_resources].end = OCTEON_IRQ_BOOTDMA;
-                num_resources++;
-        } else {
-                octeon_cf_data.dma_engine = -1;
-        }
-
-        pd = platform_device_alloc("pata_octeon_cf", -1);
-        if (!pd) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        pd->dev.platform_data = &octeon_cf_data;
-
-        ret = platform_device_add_resources(pd, cf_resources, num_resources);
-        if (ret)
-                goto fail;
-
-        ret = platform_device_add(pd);
-        if (ret)
-                goto fail;
-
-        return ret;
-fail:
-        platform_device_put(pd);
-out:
-        return ret;
-}
-device_initcall(octeon_cf_device_init);
-
 /* Octeon Random Number Generator.  */
 static int __init octeon_rng_device_init(void)
 {