sh: Kill off unused p1fc divisors from SH7763 clk fwk.

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / io.c

diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 501fe03e3715770c484684f7b1fbecfb954d2010..29cf4588fc050a996d2e62f95aa4f3ada2ad9733 100644 (file)
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -19,12 +19,12 @@
  * Copy data from IO memory space to "real" memory space.
  * This needs to be optimized.
  */
-void memcpy_fromio(void *to, volatile void __iomem *from, unsigned long count)
+void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned long count)
 {
-       char *p = to;
+       unsigned char *p = to;
         while (count) {
                 count--;
-                *p = readb((void __iomem *)from);
+                *p = readb(from);
                 p++;
                 from++;
         }
@@ -37,10 +37,10 @@ EXPORT_SYMBOL(memcpy_fromio);
  */
 void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long count)
 {
-       const char *p = from;
+       const unsigned char *p = from;
         while (count) {
                 count--;
-                writeb(*p, (void __iomem *)to);
+                writeb(*p, to);
                 p++;
                 to++;
         }
@@ -55,82 +55,21 @@ void memset_io(volatile void __iomem *dst, int c, unsigned long count)
 {
         while (count) {
                 count--;
-                writeb(c, (void __iomem *)dst);
+                writeb(c, dst);
                 dst++;
         }
 }
 EXPORT_SYMBOL(memset_io);
 
-void __raw_readsl(unsigned long addr, void *datap, int len)
-{
-       u32 *data;
-
-       for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--)
-               *data++ = ctrl_inl(addr);
-
-       if (likely(len >= (0x20 >> 2))) {
-               int tmp2, tmp3, tmp4, tmp5, tmp6;
-
-               __asm__ __volatile__(
-                       "1:                     \n\t"
-                       "mov.l  @%7, r0         \n\t"
-                       "mov.l  @%7, %2         \n\t"
-#ifdef CONFIG_CPU_SH4
-                       "movca.l r0, @%0        \n\t"
-#else
-                       "mov.l  r0, @%0         \n\t"
-#endif
-                       "mov.l  @%7, %3         \n\t"
-                       "mov.l  @%7, %4         \n\t"
-                       "mov.l  @%7, %5         \n\t"
-                       "mov.l  @%7, %6         \n\t"
-                       "mov.l  @%7, r7         \n\t"
-                       "mov.l  @%7, r0         \n\t"
-                       "mov.l  %2, @(0x04,%0)  \n\t"
-                       "mov    #0x20>>2, %2    \n\t"
-                       "mov.l  %3, @(0x08,%0)  \n\t"
-                       "sub    %2, %1          \n\t"
-                       "mov.l  %4, @(0x0c,%0)  \n\t"
-                       "cmp/hi %1, %2          ! T if 32 > len \n\t"
-                       "mov.l  %5, @(0x10,%0)  \n\t"
-                       "mov.l  %6, @(0x14,%0)  \n\t"
-                       "mov.l  r7, @(0x18,%0)  \n\t"
-                       "mov.l  r0, @(0x1c,%0)  \n\t"
-                       "bf.s   1b              \n\t"
-                       " add   #0x20, %0       \n\t"
-                       : "=&r" (data), "=&r" (len),
-                         "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4),
-                         "=&r" (tmp5), "=&r" (tmp6)
-                       : "r"(addr), "0" (data), "1" (len)
-                       : "r0", "r7", "t", "memory");
-       }
-
-       for (; len != 0; len--)
-               *data++ = ctrl_inl(addr);
-}
-EXPORT_SYMBOL(__raw_readsl);
-
-void __raw_writesl(unsigned long addr, const void *data, int len)
+void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
-       if (likely(len != 0)) {
-               int tmp1;
+       void __iomem *ret;
 
-               __asm__ __volatile__ (
-                       "1:                             \n\t"
-                       "mov.l  @%0+, %1        \n\t"
-                       "dt             %3              \n\t"
-                       "bf.s           1b              \n\t"
-                       " mov.l %1, @%4         \n\t"
-                       : "=&r" (data), "=&r" (tmp1)
-                       : "0" (data), "r" (len), "r"(addr)
-                       : "t", "memory");
-       }
-}
-EXPORT_SYMBOL(__raw_writesl);
+       ret = __ioport_map_trapped(port, nr);
+       if (ret)
+               return ret;
 
-void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-       return sh_mv.mv_ioport_map(port, nr);
+       return __ioport_map(port, nr);
 }
 EXPORT_SYMBOL(ioport_map);