omap: RX51: Remux to pull eMMC lines down when powering off

[safe/jmp/linux-2.6] / arch / sh / kernel / io_generic.c

diff --git a/arch/sh/kernel/io_generic.c b/arch/sh/kernel/io_generic.c
index 5a7f554..e1e1dbd 100644 (file)
--- a/arch/sh/kernel/io_generic.c
+++ b/arch/sh/kernel/io_generic.c
@@ -24,7 +24,7 @@
 #define dummy_read()
 #endif
 
-unsigned long generic_io_base;
+unsigned long generic_io_base = 0;
 
 u8 generic_inb(unsigned long port)
 {
@@ -73,35 +73,19 @@ u32 generic_inl_p(unsigned long port)
 
 void generic_insb(unsigned long port, void *dst, unsigned long count)
 {
-       volatile u8 *port_addr;
-       u8 *buf = dst;
-
-       port_addr = (volatile u8 __force *)__ioport_map(port, 1);
-       while (count--)
-               *buf++ = *port_addr;
+       __raw_readsb(__ioport_map(port, 1), dst, count);
+       dummy_read();
 }
 
 void generic_insw(unsigned long port, void *dst, unsigned long count)
 {
-       volatile u16 *port_addr;
-       u16 *buf = dst;
-
-       port_addr = (volatile u16 __force *)__ioport_map(port, 2);
-       while (count--)
-               *buf++ = *port_addr;
-
+       __raw_readsw(__ioport_map(port, 2), dst, count);
        dummy_read();
 }
 
 void generic_insl(unsigned long port, void *dst, unsigned long count)
 {
-       volatile u32 *port_addr;
-       u32 *buf = dst;
-
-       port_addr = (volatile u32 __force *)__ioport_map(port, 4);
-       while (count--)
-               *buf++ = *port_addr;
-
+       __raw_readsl(__ioport_map(port, 4), dst, count);
        dummy_read();
 }
 
@@ -145,42 +129,29 @@ void generic_outl_p(u32 b, unsigned long port)
  */
 void generic_outsb(unsigned long port, const void *src, unsigned long count)
 {
-       volatile u8 *port_addr;
-       const u8 *buf = src;
-
-       port_addr = (volatile u8 __force *)__ioport_map(port, 1);
-
-       while (count--)
-               *port_addr = *buf++;
+       __raw_writesb(__ioport_map(port, 1), src, count);
+       dummy_read();
 }
 
 void generic_outsw(unsigned long port, const void *src, unsigned long count)
 {
-       volatile u16 *port_addr;
-       const u16 *buf = src;
-
-       port_addr = (volatile u16 __force *)__ioport_map(port, 2);
-
-       while (count--)
-               *port_addr = *buf++;
-
+       __raw_writesw(__ioport_map(port, 2), src, count);
        dummy_read();
 }
 
 void generic_outsl(unsigned long port, const void *src, unsigned long count)
 {
-       volatile u32 *port_addr;
-       const u32 *buf = src;
-
-       port_addr = (volatile u32 __force *)__ioport_map(port, 4);
-       while (count--)
-               *port_addr = *buf++;
-
+       __raw_writesl(__ioport_map(port, 4), src, count);
        dummy_read();
 }
 
 void __iomem *generic_ioport_map(unsigned long addr, unsigned int size)
 {
+#ifdef P1SEG
+       if (PXSEG(addr) >= P1SEG)
+               return (void __iomem *)addr;
+#endif
+
        return (void __iomem *)(addr + generic_io_base);
 }