4 files changed, 79 insertions, 166 deletions

diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/renesas/r7780rp/Makefile
index 574b0316ed56..3c93012e91a3 100644
--- a/arch/sh/boards/renesas/r7780rp/Makefile
+++ b/arch/sh/boards/renesas/r7780rp/Makefile
@@ -4,5 +4,4 @@
 
 obj-y    := setup.o io.o irq.o
 
-obj-$(CONFIG_HEARTBEAT)         += led.o
 obj-$(CONFIG_PUSH_SWITCH)       += psw.o
diff --git a/arch/sh/boards/renesas/r7780rp/io.c b/arch/sh/boards/renesas/r7780rp/io.c
index 311ccccba718..f74d2ffb3851 100644
--- a/arch/sh/boards/renesas/r7780rp/io.c
+++ b/arch/sh/boards/renesas/r7780rp/io.c
@@ -11,22 +11,9 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/io.h>
 #include <asm/r7780rp.h>
 #include <asm/addrspace.h>
-#include <asm/io.h>
-
-static inline unsigned long port2adr(unsigned int port)
-{
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                if (port == 0x3f6)
-                        return (PA_AREA5_IO + 0x80c);
-                else
-                        return (PA_AREA5_IO + 0x1000 + ((port-0x1f0) << 1));
-        else
-                maybebadio((unsigned long)port);
-
-        return port;
-}
 
 static inline unsigned long port88796l(unsigned int port, int flag)
 {
@@ -40,18 +27,6 @@ static inline unsigned long port88796l(unsigned int port, int flag)
         return addr;
 }
 
-/* The 7780 R7780RP-1 seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int shifted_port(unsigned long port)
-{
-        /* For IDE registers, value is not shifted */
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                return 0;
-        else
-                return 1;
-}
-
 #if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)
 #define CHECK_AX88796L_PORT(port) \
   ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
@@ -70,12 +45,10 @@ u8 r7780rp_inb(unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
                 return ctrl_inw(port88796l(port, 0)) & 0xff;
-        else if (PXSEG(port))
-                return ctrl_inb(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 return ctrl_inb(pci_ioaddr(port));
 
-        return ctrl_inw(port2adr(port)) & 0xff;
+        return ctrl_inw(port) & 0xff;
 }
 
 u8 r7780rp_inb_p(unsigned long port)
@@ -84,12 +57,10 @@ u8 r7780rp_inb_p(unsigned long port)
 
         if (CHECK_AX88796L_PORT(port))
                 v = ctrl_inw(port88796l(port, 0)) & 0xff;
-        else if (PXSEG(port))
-                v = ctrl_inb(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 v = ctrl_inb(pci_ioaddr(port));
         else
-                v = ctrl_inw(port2adr(port)) & 0xff;
+                v = ctrl_inw(port) & 0xff;
 
         ctrl_delay();
 
@@ -98,80 +69,56 @@ u8 r7780rp_inb_p(unsigned long port)
 
 u16 r7780rp_inw(unsigned long port)
 {
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                return ctrl_inw(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        if (is_pci_ioaddr(port))
                 return ctrl_inw(pci_ioaddr(port));
-        else
-                maybebadio(port);
 
-        return 0;
+        return ctrl_inw(port);
 }
 
 u32 r7780rp_inl(unsigned long port)
 {
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                return ctrl_inl(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        if (is_pci_ioaddr(port))
                 return ctrl_inl(pci_ioaddr(port));
-        else
-                maybebadio(port);
 
-        return 0;
+        return ctrl_inl(port);
 }
 
 void r7780rp_outb(u8 value, unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
                 ctrl_outw(value, port88796l(port, 0));
-        else if (PXSEG(port))
-                ctrl_outb(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 ctrl_outb(value, pci_ioaddr(port));
         else
-                ctrl_outw(value, port2adr(port));
+                ctrl_outb(value, port);
 }
 
 void r7780rp_outb_p(u8 value, unsigned long port)
 {
         if (CHECK_AX88796L_PORT(port))
                 ctrl_outw(value, port88796l(port, 0));
-        else if (PXSEG(port))
-                ctrl_outb(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 ctrl_outb(value, pci_ioaddr(port));
         else
-                ctrl_outw(value, port2adr(port));
+                ctrl_outb(value, port);
 
         ctrl_delay();
 }
 
 void r7780rp_outw(u16 value, unsigned long port)
 {
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                ctrl_outw(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        if (is_pci_ioaddr(port))
                 ctrl_outw(value, pci_ioaddr(port));
         else
-                maybebadio(port);
+                ctrl_outw(value, port);
 }
 
 void r7780rp_outl(u32 value, unsigned long port)
 {
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                ctrl_outl(value, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        if (is_pci_ioaddr(port))
                 ctrl_outl(value, pci_ioaddr(port));
         else
-                maybebadio(port);
+                ctrl_outl(value, port);
 }
 
 void r7780rp_insb(unsigned long port, void *dst, unsigned long count)
@@ -183,16 +130,13 @@ void r7780rp_insb(unsigned long port, void *dst, unsigned long count)
                 p = (volatile u16 *)port88796l(port, 0);
                 while (count--)
                         *buf++ = *p & 0xff;
-        } else if (PXSEG(port)) {
-                while (count--)
-                        *buf++ = *(volatile u8 *)port;
-        } else if (is_pci_ioaddr(port) || shifted_port(port)) {
+        } else if (is_pci_ioaddr(port)) {
                 volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
                 while (count--)
                         *buf++ = *bp;
         } else {
-                p = (volatile u16 *)port2adr(port);
+                p = (volatile u16 *)port;
                 while (count--)
                         *buf++ = *p & 0xff;
         }
@@ -205,30 +149,26 @@ void r7780rp_insw(unsigned long port, void *dst, unsigned long count)
 
         if (CHECK_AX88796L_PORT(port))
                 p = (volatile u16 *)port88796l(port, 1);
-        else if (PXSEG(port))
-                p = (volatile u16 *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 p = (volatile u16 *)pci_ioaddr(port);
         else
-                p = (volatile u16 *)port2adr(port);
+                p = (volatile u16 *)port;
 
         while (count--)
                 *buf++ = *p;
+
+        flush_dcache_all();
 }
 
 void r7780rp_insl(unsigned long port, void *dst, unsigned long count)
 {
-        u32 *buf = dst;
-
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+        if (is_pci_ioaddr(port)) {
                 volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+                u32 *buf = dst;
 
                 while (count--)
                         *buf++ = *p;
-        } else
-                maybebadio(port);
+        }
 }
 
 void r7780rp_outsb(unsigned long port, const void *src, unsigned long count)
@@ -240,19 +180,14 @@ void r7780rp_outsb(unsigned long port, const void *src, unsigned long count)
                 p = (volatile u16 *)port88796l(port, 0);
                 while (count--)
                         *p = *buf++;
-        } else if (PXSEG(port))
-                while (count--)
-                        ctrl_outb(*buf++, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
+        } else if (is_pci_ioaddr(port)) {
                 volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
                 while (count--)
                         *bp = *buf++;
-        } else {
-                p = (volatile u16 *)port2adr(port);
+        } else
                 while (count--)
-                        *p = *buf++;
-        }
+                        ctrl_outb(*buf++, port);
 }
 
 void r7780rp_outsw(unsigned long port, const void *src, unsigned long count)
@@ -262,40 +197,37 @@ void r7780rp_outsw(unsigned long port, const void *src, unsigned long count)
 
         if (CHECK_AX88796L_PORT(port))
                 p = (volatile u16 *)port88796l(port, 1);
-        else if (PXSEG(port))
-                p = (volatile u16 *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 p = (volatile u16 *)pci_ioaddr(port);
         else
-                p = (volatile u16 *)port2adr(port);
+                p = (volatile u16 *)port;
 
         while (count--)
                 *p = *buf++;
+
+        flush_dcache_all();
 }
 
 void r7780rp_outsl(unsigned long port, const void *src, unsigned long count)
 {
         const u32 *buf = src;
+        u32 *p;
 
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
+        if (is_pci_ioaddr(port))
+                p = (u32 *)pci_ioaddr(port);
+        else
+                p = (u32 *)port;
 
-                while (count--)
-                        *p = *buf++;
-        } else
-                maybebadio(port);
+        while (count--)
+                ctrl_outl(*buf++, (unsigned long)p);
 }
 
 void __iomem *r7780rp_ioport_map(unsigned long port, unsigned int size)
 {
         if (CHECK_AX88796L_PORT(port))
                 return (void __iomem *)port88796l(port, size > 1);
-        else if (PXSEG(port))
-                return (void __iomem *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
+        else if (is_pci_ioaddr(port))
                 return (void __iomem *)pci_ioaddr(port);
 
-        return (void __iomem *)port2adr(port);
+        return (void __iomem *)port;
 }
diff --git a/arch/sh/boards/renesas/r7780rp/led.c b/arch/sh/boards/renesas/r7780rp/led.c
deleted file mode 100644
index 6a00a257afd2..000000000000
--- a/arch/sh/boards/renesas/r7780rp/led.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) Atom Create Engineering Co., Ltd.
- *
- * May be copied or modified under the terms of GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains Renesas Solutions HIGHLANDER R7780RP-1 specific LED code.
- */
-#include <linux/sched.h>
-#include <asm/io.h>
-#include <asm/r7780rp/r7780rp.h>
-
-/* Cycle the LED's in the clasic Knightriger/Sun pattern */
-void heartbeat_r7780rp(void)
-{
-        static unsigned int cnt = 0, period = 0;
-        volatile unsigned short *p = (volatile unsigned short *)PA_OBLED;
-        static unsigned bit = 0, up = 1;
-        unsigned bit_pos[] = {2, 1, 0, 3, 6, 5, 4, 7};
-
-        cnt += 1;
-        if (cnt < period)
-                return;
-
-        cnt = 0;
-
-        /* Go through the points (roughly!):
-         * f(0)=10, f(1)=16, f(2)=20, f(5)=35, f(int)->110
-         */
-        period = 110 - ((300 << FSHIFT)/((avenrun[0]/5) + (3<<FSHIFT)));
-
-        *p = 1 << bit_pos[bit];
-        if (up)
-                if (bit == 7) {
-                        bit--;
-                        up = 0;
-                } else
-                        bit++;
-        else if (bit == 0)
-                up = 1;
-        else
-                bit--;
-}
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index 9f89c8de9db9..0d74db9f1792 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -2,7 +2,7 @@
  * arch/sh/boards/renesas/r7780rp/setup.c
  *
  * Copyright (C) 2002 Atom Create Engineering Co., Ltd.
- * Copyright (C) 2005, 2006 Paul Mundt
+ * Copyright (C) 2005 - 2007 Paul Mundt
  *
  * Renesas Solutions Highlander R7780RP-1 Support.
  *
@@ -12,12 +12,12 @@
  */
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/pata_platform.h>
 #include <asm/machvec.h>
 #include <asm/r7780rp.h>
 #include <asm/clock.h>
 #include <asm/io.h>
 
-extern void heartbeat_r7780rp(void);
 extern void init_r7780rp_IRQ(void);
 
 static struct resource m66596_usb_host_resources[] = {
@@ -46,14 +46,14 @@ static struct platform_device m66596_usb_host_device = {
 
 static struct resource cf_ide_resources[] = {
         [0] = {
-                .start  = 0x1f0,
-                .end    = 0x1f0 + 8,
-                .flags  = IORESOURCE_IO,
+                .start  = PA_AREA5_IO + 0x1000,
+                .end    = PA_AREA5_IO + 0x1000 + 0x08 - 1,
+                .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 0x1f0 + 0x206,
-                .end    = 0x1f0 + 8 + 0x206 + 8,
-                .flags  = IORESOURCE_IO,
+                .start  = PA_AREA5_IO + 0x80c,
+                .end    = PA_AREA5_IO + 0x80c + 0x16 - 1,
+                .flags  = IORESOURCE_MEM,
         },
         [2] = {
 #ifdef CONFIG_SH_R7780MP
@@ -65,16 +65,44 @@ static struct resource cf_ide_resources[] = {
         },
 };
 
+static struct pata_platform_info pata_info = {
+        .ioport_shift   = 1,
+};
+
 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,
+        },
+};
+
+static unsigned char heartbeat_bit_pos[] = { 2, 1, 0, 3, 6, 5, 4, 7 };
+
+static struct resource heartbeat_resources[] = {
+        [0] = {
+                .start  = PA_OBLED,
+                .end    = PA_OBLED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .dev    = {
+                .platform_data  = heartbeat_bit_pos,
+        },
+        .num_resources  = ARRAY_SIZE(heartbeat_resources),
+        .resource       = heartbeat_resources,
 };
 
 static struct platform_device *r7780rp_devices[] __initdata = {
         &m66596_usb_host_device,
         &cf_ide_device,
+        &heartbeat_device,
 };
 
 static int __init r7780rp_devices_setup(void)
@@ -148,7 +176,7 @@ static void __init r7780rp_setup(char **cmdline_p)
 #ifndef CONFIG_SH_R7780MP
         ctrl_outw(0x0001, PA_SDPOW);    /* SD Power ON */
 #endif
-        ctrl_outw(ctrl_inw(PA_IVDRCTL) | 0x0100, PA_IVDRCTL);   /* Si13112 */
+        ctrl_outw(ctrl_inw(PA_IVDRCTL) | 0x01, PA_IVDRCTL);     /* Si13112 */
 
         pm_power_off = r7780rp_power_off;
 }
@@ -185,8 +213,5 @@ struct sh_machine_vector mv_r7780rp __initmv = {
 
         .mv_ioport_map          = r7780rp_ioport_map,
         .mv_init_irq            = init_r7780rp_IRQ,
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = heartbeat_r7780rp,
-#endif
 };
 ALIAS_MV(r7780rp)