ARM: clps711x: Move debug include into arch/arm/include/debug/

One more step to allowing CLPS711X to participate in the
multi-platform defconfig.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 1 insertions, 39 deletions

diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
deleted file mode 100644
index cb3684f8dae0..000000000000
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* arch/arm/mach-clps711x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-#include <mach/hardware.h>
-
-                .macro  addruart, rp, rv, tmp
-#ifndef CONFIG_DEBUG_CLPS711X_UART2
-                mov     \rp, #0x0000    @ UART1
-#else
-                mov     \rp, #0x1000    @ UART2
-#endif
-                orr     \rv, \rp, #CLPS711X_VIRT_BASE
-                orr     \rp, \rp, #CLPS711X_PHYS_BASE
-                .endm
-
-                .macro  senduart,rd,rx
-                str     \rd, [\rx, #0x0480]     @ UARTDR
-                .endm
-
-                .macro  waituart,rd,rx
-                .endm
-
-                .macro  busyuart,rd,rx
-1001:           ldr     \rd, [\rx, #0x0140]     @ SYSFLGx
-                tst     \rd, #1 << 11           @ UBUSYx
-                bne     1001b
-                .endm
-
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 292cbcb0ecad..833129c9f798 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -24,7 +24,7 @@
 
 #include <mach/clps711x.h>
 
-#define CLPS711X_VIRT_BASE      IOMEM(0xfe000000)
+#define CLPS711X_VIRT_BASE      IOMEM(0xfeff0000)
 
 #ifndef __ASSEMBLY__
 #define clps_readb(off)         readb(CLPS711X_VIRT_BASE + (off))