aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/hardware
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-07-07 07:36:46 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-25 12:11:06 -0400
commit4e218b99285485a6788339ee660cc535c7bd5017 (patch)
treea4dff3f4804ae5f07de62faaa31710b428a95098 /arch/arm/include/asm/hardware
parent5c972af407419c79e1e922fb241fa0d06b4f1ffd (diff)
ARM: debug: move PL01X debug include into arch/arm/include/debug/
Now that the PL01X debug include can mostly stand alone without requiring platforms to provide any macros, move it into the debug directory so it can be directly included. This allows us to get rid of a lot of debug-macros include files. The autodetect case for Versatile Express and the ux500 are left alone; these are more complicated implementations. Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Ryan Mallon <rmallon@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/hardware')
-rw-r--r--arch/arm/include/asm/hardware/debug-pl01x.S36
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/include/asm/hardware/debug-pl01x.S b/arch/arm/include/asm/hardware/debug-pl01x.S
deleted file mode 100644
index 9d1e286cecfd..000000000000
--- a/arch/arm/include/asm/hardware/debug-pl01x.S
+++ /dev/null
@@ -1,36 +0,0 @@
1/* arch/arm/include/asm/hardware/debug-pl01x.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#include <linux/amba/serial.h>
14
15#ifdef CONFIG_DEBUG_UART_PHYS
16 .macro addruart, rp, rv, tmp
17 ldr \rp, =CONFIG_DEBUG_UART_PHYS
18 ldr \rv, =CONFIG_DEBUG_UART_VIRT
19 .endm
20#endif
21
22 .macro senduart,rd,rx
23 strb \rd, [\rx, #UART01x_DR]
24 .endm
25
26 .macro waituart,rd,rx
271001: ldr \rd, [\rx, #UART01x_FR]
28 tst \rd, #UART01x_FR_TXFF
29 bne 1001b
30 .endm
31
32 .macro busyuart,rd,rx
331001: ldr \rd, [\rx, #UART01x_FR]
34 tst \rd, #UART01x_FR_BUSY
35 bne 1001b
36 .endm