summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-03-06 09:06:10 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-03-06 10:17:38 +0100
commit1b9f6ee3041e56d104b70044e9274c1b39830792 (patch)
tree12d64f7f12b06473f0ce5fd3b5ee80a46a006e6c /arch/arm
parentc809f0bc436dcae05230a082597c046a307dc3bb (diff)
downloadbarebox-1b9f6ee3041e56d104b70044e9274c1b39830792.tar.gz
barebox-1b9f6ee3041e56d104b70044e9274c1b39830792.tar.xz
debug_ll: Move pl011 header file to architecture independent place
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/debug_ll_pl011.h25
-rw-r--r--arch/arm/mach-bcm283x/include/mach/debug_ll.h2
-rw-r--r--arch/arm/mach-highbank/include/mach/debug_ll.h2
-rw-r--r--arch/arm/mach-qemu/include/mach/debug_ll.h2
-rw-r--r--arch/arm/mach-versatile/include/mach/debug_ll.h2
-rw-r--r--arch/arm/mach-vexpress/include/mach/debug_ll.h2
6 files changed, 5 insertions, 30 deletions
diff --git a/arch/arm/include/asm/debug_ll_pl011.h b/arch/arm/include/asm/debug_ll_pl011.h
deleted file mode 100644
index db015a373b..0000000000
--- a/arch/arm/include/asm/debug_ll_pl011.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __INCLUDE_ARM_ASM_DEBUG_LL_PL011_H__
-#define __INCLUDE_ARM_ASM_DEBUG_LL_PL011_H__
-
-#ifndef DEBUG_LL_UART_ADDR
-#error DEBUG_LL_UART_ADDR is undefined!
-#endif
-
-#include <io.h>
-#include <linux/amba/serial.h>
-
-static inline void PUTC_LL(char c)
-{
- /* Wait until there is space in the FIFO */
- while (readl(DEBUG_LL_UART_ADDR + UART01x_FR) & UART01x_FR_TXFF)
- ;
-
- /* Send the character */
- writel(c, DEBUG_LL_UART_ADDR + UART01x_DR);
-
- /* Wait to make sure it hits the line, in case we die too soon. */
- while (readl(DEBUG_LL_UART_ADDR + UART01x_FR) & UART01x_FR_TXFF)
- ;
-}
-
-#endif /* __INCLUDE_ARM_ASM_DEBUG_LL_PL011_H__ */
diff --git a/arch/arm/mach-bcm283x/include/mach/debug_ll.h b/arch/arm/mach-bcm283x/include/mach/debug_ll.h
index a625a8bdb7..2e95bf8320 100644
--- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h
+++ b/arch/arm/mach-bcm283x/include/mach/debug_ll.h
@@ -26,6 +26,6 @@
#define DEBUG_LL_UART_ADDR CONFIG_MACH_RPI_DEBUG_UART_BASE
-#include <asm/debug_ll_pl011.h>
+#include <debug_ll/pl011.h>
#endif /* __MACH_BCM2835_DEBUG_LL_H__ */
diff --git a/arch/arm/mach-highbank/include/mach/debug_ll.h b/arch/arm/mach-highbank/include/mach/debug_ll.h
index 1820eb1d13..5d0fae80e7 100644
--- a/arch/arm/mach-highbank/include/mach/debug_ll.h
+++ b/arch/arm/mach-highbank/include/mach/debug_ll.h
@@ -9,6 +9,6 @@
#define DEBUG_LL_UART_ADDR 0xfff36000
-#include <asm/debug_ll_pl011.h>
+#include <debug_ll/pl011.h>
#endif
diff --git a/arch/arm/mach-qemu/include/mach/debug_ll.h b/arch/arm/mach-qemu/include/mach/debug_ll.h
index 89b06923ad..d59f68ea19 100644
--- a/arch/arm/mach-qemu/include/mach/debug_ll.h
+++ b/arch/arm/mach-qemu/include/mach/debug_ll.h
@@ -19,6 +19,6 @@
#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1
#endif
-#include <asm/debug_ll_pl011.h>
+#include <debug_ll/pl011.h>
#endif
diff --git a/arch/arm/mach-versatile/include/mach/debug_ll.h b/arch/arm/mach-versatile/include/mach/debug_ll.h
index e6ee877a54..073402c51a 100644
--- a/arch/arm/mach-versatile/include/mach/debug_ll.h
+++ b/arch/arm/mach-versatile/include/mach/debug_ll.h
@@ -18,6 +18,6 @@
#define DEBUG_LL_UART_ADDR 0x101F1000
-#include <asm/debug_ll_pl011.h>
+#include <debug_ll/pl011.h>
#endif
diff --git a/arch/arm/mach-vexpress/include/mach/debug_ll.h b/arch/arm/mach-vexpress/include/mach/debug_ll.h
index 89b06923ad..d59f68ea19 100644
--- a/arch/arm/mach-vexpress/include/mach/debug_ll.h
+++ b/arch/arm/mach-vexpress/include/mach/debug_ll.h
@@ -19,6 +19,6 @@
#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1
#endif
-#include <asm/debug_ll_pl011.h>
+#include <debug_ll/pl011.h>
#endif