1 files changed, 43 insertions, 120 deletions

diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c
index 122d6996263..a83a5d9587b 100644
--- a/arch/sh/boards/landisk/setup.c
+++ b/arch/sh/boards/landisk/setup.c
@@ -1,144 +1,90 @@
 /*
  * arch/sh/boards/landisk/setup.c
  *
- * Copyright (C) 2000 Kazumoto Kojima
- * Copyright (C) 2002 Paul Mundt
- *
  * I-O DATA Device, Inc. LANDISK Support.
  *
- * Modified for LANDISK by
- * Atom Create Engineering Co., Ltd. 2002.
- *
- * modifed by kogiidena
- * 2005.09.16
+ * Copyright (C) 2000 Kazumoto Kojima
+ * Copyright (C) 2002 Paul Mundt
+ * Copylight (C) 2002 Atom Create Engineering Co., Ltd.
+ * Copyright (C) 2005-2007 kogiidena
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
 #include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/pata_platform.h>
 #include <linux/pm.h>
 #include <linux/mm.h>
 #include <asm/machvec.h>
-#include <asm/rtc.h>
 #include <asm/landisk/iodata_landisk.h>
 #include <asm/io.h>
 
-void landisk_time_init(void);
 void init_landisk_IRQ(void);
 
-int landisk_ledparam;
-int landisk_buzzerparam;
-int landisk_arch;
-
-/* cycle the led's in the clasic knightrider/sun pattern */
-static void heartbeat_landisk(void)
-{
-        static unsigned int cnt = 0, blink = 0x00, period = 25;
-        volatile u8 *p = (volatile u8 *)PA_LED;
-        char data;
-
-        if ((landisk_ledparam & 0x080) == 0)
-                return;
-
-        cnt += 1;
-
-        if (cnt < period)
-                return;
-
-        cnt = 0;
-        blink++;
-
-        data = (blink & 0x01) ? (landisk_ledparam >> 16) : 0;
-        data |= (blink & 0x02) ? (landisk_ledparam >> 8) : 0;
-        data |= landisk_ledparam;
-
-        /* buzzer */
-        if (landisk_buzzerparam & 0x1) {
-                data |= 0x80;
-        } else {
-                data &= 0x7f;
-        }
-        *p = data;
-
-        if (((landisk_ledparam & 0x007f7f00) == 0) &&
-             (landisk_buzzerparam == 0))
-                landisk_ledparam &= (~0x0080);
-
-        landisk_buzzerparam >>= 1;
-}
-
 static void landisk_power_off(void)
 {
         ctrl_outb(0x01, PA_SHUTDOWN);
 }
 
-static void check_usl5p(void)
-{
-        volatile u8 *p = (volatile u8 *)PA_LED;
-        u8 tmp1, tmp2;
+static struct resource cf_ide_resources[3];
 
-        tmp1 = *p;
-        *p = 0x40;
-        tmp2 = *p;
-        *p = tmp1;
+static struct pata_platform_info pata_info = {
+        .ioport_shift   = 1,
+};
 
-        landisk_arch = (tmp2 == 0x40);
-        if (landisk_arch == 1) {
-                /* arch == usl-5p */
-                landisk_ledparam = 0x00000380;
-                landisk_ledparam |= (tmp1 & 0x07c);
-        } else {
-                /* arch == landisk */
-                landisk_ledparam = 0x02000180;
-                landisk_ledparam |= 0x04;
-        }
-}
+static struct platform_device cf_ide_device = {
+        .name           = "pata_platform",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cf_ide_resources),
+        .resource       = cf_ide_resources,
+        .dev            = {
+                .platform_data = &pata_info,
+        },
+};
 
-void *area5_io_base;
-void *area6_io_base;
+static struct platform_device *landisk_devices[] __initdata = {
+        &cf_ide_device,
+};
 
-static int __init landisk_cf_init(void)
+static int __init landisk_devices_setup(void)
 {
         pgprot_t prot;
-        unsigned long paddrbase, psize;
+        unsigned long paddrbase;
+        void *cf_ide_base;
 
         /* open I/O area window */
         paddrbase = virt_to_phys((void *)PA_AREA5_IO);
-        psize = PAGE_SIZE;
         prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
-        area5_io_base = p3_ioremap(paddrbase, psize, prot.pgprot);
-        if (!area5_io_base) {
+        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;
         }
 
-        paddrbase = virt_to_phys((void *)PA_AREA6_IO);
-        psize = PAGE_SIZE;
-        prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO16);
-        area6_io_base = p3_ioremap(paddrbase, psize, prot.pgprot);
-        if (!area6_io_base) {
-                printk("allocate_cf_area : can't open HDD I/O window!\n");
-                return -ENOMEM;
-        }
-
-        printk(KERN_INFO "Allocate Area5/6 success.\n");
-
-        /* XXX : do we need attribute and common-memory area also? */
-
-        return 0;
+        /* 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(landisk_devices,
+                                    ARRAY_SIZE(landisk_devices));
 }
 
+__initcall(landisk_devices_setup);
+
 static void __init landisk_setup(char **cmdline_p)
 {
-        device_initcall(landisk_cf_init);
-
-        landisk_buzzerparam = 0;
-        check_usl5p();
+        /* LED ON */
+        ctrl_outb(ctrl_inb(PA_LED) | 0x03, PA_LED);
 
         printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
-
-        board_time_init = landisk_time_init;
         pm_power_off = landisk_power_off;
 }
 
@@ -148,29 +94,6 @@ static void __init landisk_setup(char **cmdline_p)
 struct sh_machine_vector mv_landisk __initmv = {
         .mv_name = "LANDISK",
         .mv_setup = landisk_setup,
-        .mv_nr_irqs = 72,
-        .mv_inb = landisk_inb,
-        .mv_inw = landisk_inw,
-        .mv_inl = landisk_inl,
-        .mv_outb = landisk_outb,
-        .mv_outw = landisk_outw,
-        .mv_outl = landisk_outl,
-        .mv_inb_p = landisk_inb_p,
-        .mv_inw_p = landisk_inw,
-        .mv_inl_p = landisk_inl,
-        .mv_outb_p = landisk_outb_p,
-        .mv_outw_p = landisk_outw,
-        .mv_outl_p = landisk_outl,
-        .mv_insb = landisk_insb,
-        .mv_insw = landisk_insw,
-        .mv_insl = landisk_insl,
-        .mv_outsb = landisk_outsb,
-        .mv_outsw = landisk_outsw,
-        .mv_outsl = landisk_outsl,
-        .mv_ioport_map = landisk_ioport_map,
         .mv_init_irq = init_landisk_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat = heartbeat_landisk,
-#endif
 };
 ALIAS_MV(landisk)