10 files changed, 29 insertions, 76 deletions

diff --git a/arch/arm/include/asm/hardware/clps7111.h b/arch/arm/include/asm/hardware/clps7111.h
index 44477225aed6..78e2856b06dc 100644
--- a/arch/arm/include/asm/hardware/clps7111.h
+++ b/arch/arm/include/asm/hardware/clps7111.h
@@ -23,16 +23,7 @@
 #ifndef __ASM_HARDWARE_CLPS7111_H
 #define __ASM_HARDWARE_CLPS7111_H
 
-#define CLPS7111_PHYS_BASE      (0x80000000)
-
-#ifndef __ASSEMBLY__
-#define clps_readb(off)         __raw_readb(CLPS7111_BASE + (off))
-#define clps_readw(off)         __raw_readw(CLPS7111_BASE + (off))
-#define clps_readl(off)         __raw_readl(CLPS7111_BASE + (off))
-#define clps_writeb(val,off)    __raw_writeb(val, CLPS7111_BASE + (off))
-#define clps_writew(val,off)    __raw_writew(val, CLPS7111_BASE + (off))
-#define clps_writel(val,off)    __raw_writel(val, CLPS7111_BASE + (off))
-#endif
+#define CLPS711X_PHYS_BASE      (0x80000000)
 
 #define PADR            (0x0000)
 #define PBDR            (0x0001)
diff --git a/arch/arm/include/asm/hardware/ep7211.h b/arch/arm/include/asm/hardware/ep7211.h
index 654d5f625c49..4b3f86bf1bfc 100644
--- a/arch/arm/include/asm/hardware/ep7211.h
+++ b/arch/arm/include/asm/hardware/ep7211.h
@@ -23,15 +23,6 @@
 #ifndef __ASM_HARDWARE_EP7211_H
 #define __ASM_HARDWARE_EP7211_H
 
-#include <asm/hardware/clps7111.h>
-
-/*
- * define EP7211_BASE to be the base address of the region
- * you want to access.
- */
-
-#define EP7211_PHYS_BASE        (0x80000000)
-
 /*
  * XXX miket@bluemug.com: need to introduce EP7211 registers (those not
  * present in 7212) here.
diff --git a/arch/arm/include/asm/hardware/ep7212.h b/arch/arm/include/asm/hardware/ep7212.h
index 3b43bbeaf1db..aad07f77dcff 100644
--- a/arch/arm/include/asm/hardware/ep7212.h
+++ b/arch/arm/include/asm/hardware/ep7212.h
@@ -24,18 +24,6 @@
 #define __ASM_HARDWARE_EP7212_H
 
 /*
- * define EP7212_BASE to be the base address of the region
- * you want to access.
- */
-
-#define EP7212_PHYS_BASE        (0x80000000)
-
-#ifndef __ASSEMBLY__
-#define ep_readl(off)           __raw_readl(EP7212_BASE + (off))
-#define ep_writel(val,off)      __raw_writel(val, EP7212_BASE + (off))
-#endif
-
-/*
  * These registers are specific to the EP7212 only
  */
 #define DAIR                    0x2000
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index 3c5b5bbf24e5..b6dfd2f22cd4 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -36,7 +36,6 @@
 #include <asm/page.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/hardware/clps7111.h>
 #include <asm/system_misc.h>
 
 /*
@@ -44,8 +43,8 @@
  */
 static struct map_desc clps711x_io_desc[] __initdata = {
         {
-                .virtual        = CLPS7111_VIRT_BASE,
-                .pfn            = __phys_to_pfn(CLPS7111_PHYS_BASE),
+                .virtual        = (unsigned long)CLPS711X_VIRT_BASE,
+                .pfn            = __phys_to_pfn(CLPS711X_PHYS_BASE),
                 .length         = SZ_1M,
                 .type           = MT_DEVICE
         }
diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
index b802e8a51831..118b3d930573 100644
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S
@@ -12,7 +12,6 @@
 */
 
 #include <mach/hardware.h>
-#include <asm/hardware/clps7111.h>
 
                 .macro  addruart, rp, rv, tmp
 #ifndef CONFIG_DEBUG_CLPS711X_UART2
@@ -20,8 +19,8 @@
 #else
                 mov     \rp, #0x1000    @ UART2
 #endif
-                orr     \rv, \rp, #CLPS7111_VIRT_BASE
-                orr     \rp, \rp, #CLPS7111_PHYS_BASE
+                orr     \rv, \rp, #CLPS711X_VIRT_BASE
+                orr     \rp, \rp, #CLPS711X_PHYS_BASE
                 .endm
 
                 .macro  senduart,rd,rx
diff --git a/arch/arm/mach-clps711x/include/mach/entry-macro.S b/arch/arm/mach-clps711x/include/mach/entry-macro.S
index 125af59d7a29..56e5c2c23504 100644
--- a/arch/arm/mach-clps711x/include/mach/entry-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/entry-macro.S
@@ -8,7 +8,6 @@
  * warranty of any kind, whether express or implied.
  */
 #include <mach/hardware.h>
-#include <asm/hardware/clps7111.h>
 
                 .macro  get_irqnr_preamble, base, tmp
                 .endm
@@ -18,7 +17,7 @@
 #endif
 
                 .macro  get_irqnr_and_base, irqnr, stat, base, mask
-                mov     \base, #CLPS7111_BASE
+                mov     \base, #CLPS711X_VIRT_BASE
                 ldr     \stat, [\base, #INTSR1]
                 ldr     \mask, [\base, #INTMR1]
                 mov     \irqnr, #4
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index d0b7d870be9c..1026ac968706 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -19,12 +19,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
+#ifndef __MACH_HARDWARE_H
+#define __MACH_HARDWARE_H
 
+#include <asm/hardware/clps7111.h>
+
+#define CLPS711X_VIRT_BASE      IOMEM(0xff000000)
 
-#define CLPS7111_VIRT_BASE      0xff000000
-#define CLPS7111_BASE           CLPS7111_VIRT_BASE
+#ifndef __ASSEMBLY__
+#define clps_readb(off)         readb(CLPS711X_VIRT_BASE + (off))
+#define clps_readw(off)         readw(CLPS711X_VIRT_BASE + (off))
+#define clps_readl(off)         readl(CLPS711X_VIRT_BASE + (off))
+#define clps_writeb(val,off)    writeb(val, CLPS711X_VIRT_BASE + (off))
+#define clps_writew(val,off)    writew(val, CLPS711X_VIRT_BASE + (off))
+#define clps_writel(val,off)    writel(val, CLPS711X_VIRT_BASE + (off))
+#endif
 
 /*
  * The physical addresses that the external chip select signals map to is
@@ -54,14 +63,10 @@
 
 #if defined (CONFIG_ARCH_EP7211)
 
-#define EP7211_VIRT_BASE        CLPS7111_VIRT_BASE
-#define EP7211_BASE             CLPS7111_VIRT_BASE
 #include <asm/hardware/ep7211.h>
 
 #elif defined (CONFIG_ARCH_EP7212)
 
-#define EP7212_VIRT_BASE        CLPS7111_VIRT_BASE
-#define EP7212_BASE             CLPS7111_VIRT_BASE
 #include <asm/hardware/ep7212.h>
 
 #endif
@@ -71,10 +76,6 @@
 
 #if  defined (CONFIG_ARCH_AUTCPU12)
 
-#define  CS89712_VIRT_BASE      CLPS7111_VIRT_BASE
-#define  CS89712_BASE           CLPS7111_VIRT_BASE
-
-#include <asm/hardware/clps7111.h>
 #include <asm/hardware/ep7212.h>
 #include <asm/hardware/cs89712.h>
 
@@ -83,15 +84,9 @@
 
 #if defined (CONFIG_ARCH_CDB89712)
 
-#include <asm/hardware/clps7111.h>
 #include <asm/hardware/ep7212.h>
 #include <asm/hardware/cs89712.h>
 
-/* static cdb89712_map_io() areas */
-#define REGISTER_START   0x80000000
-#define REGISTER_SIZE    0x4000
-#define REGISTER_BASE    0xff000000
-
 #define ETHER_START      0x20000000
 #define ETHER_SIZE       0x1000
 #define ETHER_BASE       0xfe000000
@@ -154,13 +149,8 @@
 
 #if defined (CONFIG_ARCH_CEIVA)
 
-#define  CEIVA_VIRT_BASE        CLPS7111_VIRT_BASE
-#define  CEIVA_BASE             CLPS7111_VIRT_BASE
-
-#include <asm/hardware/clps7111.h>
 #include <asm/hardware/ep7212.h>
 
-
 /*
  * The two flash banks are wired to chip selects 0 and 1. This is the mapping
  * for them.
diff --git a/arch/arm/mach-clps711x/include/mach/time.h b/arch/arm/mach-clps711x/include/mach/time.h
index 61fef9129c6a..5f65865884ce 100644
--- a/arch/arm/mach-clps711x/include/mach/time.h
+++ b/arch/arm/mach-clps711x/include/mach/time.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <asm/leds.h>
-#include <asm/hardware/clps7111.h>
+#include <mach/hardware.h>
 
 extern void clps711x_setup_timer(void);
 
diff --git a/arch/arm/mach-clps711x/include/mach/uncompress.h b/arch/arm/mach-clps711x/include/mach/uncompress.h
index 35ed731b9f16..263f8393ccb7 100644
--- a/arch/arm/mach-clps711x/include/mach/uncompress.h
+++ b/arch/arm/mach-clps711x/include/mach/uncompress.h
@@ -17,15 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
-#undef CLPS7111_BASE
-#define CLPS7111_BASE CLPS7111_PHYS_BASE
-
-#define __raw_readl(p)          (*(unsigned long *)(p))
-#define __raw_writel(v,p)       (*(unsigned long *)(p) = (v))
-
 #ifdef CONFIG_DEBUG_CLPS711X_UART2
 #define SYSFLGx SYSFLG2
 #define UARTDRx UARTDR2
@@ -34,19 +27,25 @@
 #define UARTDRx UARTDR1
 #endif
 
+#define phys_reg(x)     (*(volatile u32 *)(CLPS711X_PHYS_BASE + (x)))
+
 /*
+ * The following code assumes the serial port has already been
+ * initialized by the bootloader.  If you didn't setup a port in
+ * your bootloader then nothing will appear (which might be desired).
+ *
  * This does not append a newline
  */
 static inline void putc(int c)
 {
-        while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
+        while (phys_reg(SYSFLGx) & SYSFLG_UTXFF)
                 barrier();
-        clps_writel(c, UARTDRx);
+        phys_reg(UARTDRx) = c;
 }
 
 static inline void flush(void)
 {
-        while (clps_readl(SYSFLGx) & SYSFLG_UBUSY)
+        while (phys_reg(SYSFLGx) & SYSFLG_UBUSY)
                 barrier();
 }
 
diff --git a/arch/arm/mach-clps711x/p720t-leds.c b/arch/arm/mach-clps711x/p720t-leds.c
index dd9a6cdbeb02..bbc449fbe14a 100644
--- a/arch/arm/mach-clps711x/p720t-leds.c
+++ b/arch/arm/mach-clps711x/p720t-leds.c
@@ -27,9 +27,6 @@
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 
-#include <asm/hardware/clps7111.h>
-#include <asm/hardware/ep7212.h>
-
 static void p720t_leds_event(led_event_t ledevt)
 {
         unsigned long flags;