aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x/include/mach
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach')
-rw-r--r--arch/arm/mach-clps711x/include/mach/debug-macro.S38
-rw-r--r--arch/arm/mach-clps711x/include/mach/hardware.h5
2 files changed, 1 insertions, 42 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 @@
1/* arch/arm/mach-clps711x/include/mach/debug-macro.S
2 *
3 * Debugging macro include header
4 *
5 * Copyright (C) 1994-1999 Russell King
6 * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11 *
12*/
13
14#include <mach/hardware.h>
15
16 .macro addruart, rp, rv, tmp
17#ifndef CONFIG_DEBUG_CLPS711X_UART2
18 mov \rp, #0x0000 @ UART1
19#else
20 mov \rp, #0x1000 @ UART2
21#endif
22 orr \rv, \rp, #CLPS711X_VIRT_BASE
23 orr \rp, \rp, #CLPS711X_PHYS_BASE
24 .endm
25
26 .macro senduart,rd,rx
27 str \rd, [\rx, #0x0480] @ UARTDR
28 .endm
29
30 .macro waituart,rd,rx
31 .endm
32
33 .macro busyuart,rd,rx
341001: ldr \rd, [\rx, #0x0140] @ SYSFLGx
35 tst \rd, #1 << 11 @ UBUSYx
36 bne 1001b
37 .endm
38
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 5d6afda1c0e8..833129c9f798 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -24,10 +24,7 @@
24 24
25#include <mach/clps711x.h> 25#include <mach/clps711x.h>
26 26
27#define IO_ADDRESS(x) (0xdc000000 + (((x) & 0x03ffffff) | \ 27#define CLPS711X_VIRT_BASE IOMEM(0xfeff0000)
28 (((x) >> 2) & 0x3c000000)))
29
30#define CLPS711X_VIRT_BASE IOMEM(IO_ADDRESS(CLPS711X_PHYS_BASE))
31 28
32#ifndef __ASSEMBLY__ 29#ifndef __ASSEMBLY__
33#define clps_readb(off) readb(CLPS711X_VIRT_BASE + (off)) 30#define clps_readb(off) readb(CLPS711X_VIRT_BASE + (off))