sh: mach-sh03: Move off of cf_enabler to pata_platform, as per landisk.

This gets rid of the cf enabler use on mach-sh03 and switches to use
pata_platform with the proper address directly. cf_enabler is
subsequently disabled for mach-sh03.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 35 insertions, 6 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index a3ac98b68938..57fd4983cc1d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -703,7 +703,7 @@ config MAPLE
 
 config CF_ENABLER
         bool "Compact Flash Enabler support"
-        depends on SOLUTION_ENGINE || SH_SH03
+        depends on SOLUTION_ENGINE
         ---help---
           Compact Flash is a small, removable mass storage device introduced
           in 1994 originally as a PCMCIA device.  If you say `Y' here, you
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
index 5771219be3fd..0d0b37f9fea4 100644
--- a/arch/sh/boards/mach-sh03/setup.c
+++ b/arch/sh/boards/mach-sh03/setup.c
@@ -9,6 +9,7 @@
 #include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/ata_platform.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
 #include <mach-sh03/mach/io.h>
@@ -20,15 +21,10 @@ static void __init init_sh03_IRQ(void)
         plat_irq_setup_pins(IRQ_MODE_IRQ);
 }
 
-extern void *cf_io_base;
-
 static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size)
 {
         if (PXSEG(port))
                 return (void __iomem *)port;
-        /* CompactFlash (IDE) */
-        if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6))
-                return (void __iomem *)((unsigned long)cf_io_base + port);
 
         return (void __iomem *)(port + PCI_IO_BASE);
 }
@@ -41,6 +37,15 @@ static void __init sh03_setup(char **cmdline_p)
         board_time_init = sh03_time_init;
 }
 
+static struct resource cf_ide_resources[3];
+
+static struct platform_device cf_ide_device = {
+        .name           = "pata_platform",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cf_ide_resources),
+        .resource       = cf_ide_resources,
+};
+
 static struct resource heartbeat_resources[] = {
         [0] = {
                 .start  = 0xa0800000,
@@ -58,10 +63,34 @@ static struct platform_device heartbeat_device = {
 
 static struct platform_device *sh03_devices[] __initdata = {
         &heartbeat_device,
+        &cf_ide_device,
 };
 
 static int __init sh03_devices_setup(void)
 {
+        pgprot_t prot;
+        unsigned long paddrbase;
+        void *cf_ide_base;
+
+        /* open I/O area window */
+        paddrbase = virt_to_phys((void *)PA_AREA5_IO);
+        prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
+        cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
+        if (!cf_ide_base) {
+                printk("allocate_cf_area : can't open CF I/O window!\n");
+                return -ENOMEM;
+        }
+
+        /* IDE cmd address : 0x1f0-0x1f7 and 0x3f6 */
+        cf_ide_resources[0].start = (unsigned long)cf_ide_base + 0x40;
+        cf_ide_resources[0].end   = (unsigned long)cf_ide_base + 0x40 + 0x0f;
+        cf_ide_resources[0].flags = IORESOURCE_IO;
+        cf_ide_resources[1].start = (unsigned long)cf_ide_base + 0x2c;
+        cf_ide_resources[1].end   = (unsigned long)cf_ide_base + 0x2c + 0x03;
+        cf_ide_resources[1].flags = IORESOURCE_IO;
+        cf_ide_resources[2].start = IRQ_FATA;
+        cf_ide_resources[2].flags = IORESOURCE_IRQ;
+
         return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices));
 }
 __initcall(sh03_devices_setup);