ARM: 8270/1: ks8695: Migrate debug_ll macros to shared directory

As part of the migration a couple of uart definitions have been copied
from of the platform specific header files.

Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 6ee9b0d361eea4de4ee8cf8b49ee8ff759b4a9c7..eba36e35bad2f56b270881883620273bc189fdfa 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -397,6 +397,13 @@ choice
                  Say Y here if you want the debug print routines to direct
                  their output to UART1 serial port on KEYSTONE2 devices.
 
+       config DEBUG_KS8695_UART
+               bool "KS8695 Debug UART"
+               depends on ARCH_KS8695
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on KS8695.
+
        config DEBUG_MESON_UARTAO
                bool "Kernel low-level debugging via Meson6 UARTAO"
                depends on ARCH_MESON
@@ -1174,6 +1181,7 @@ config DEBUG_LL_INCLUDE
                                 DEBUG_IMX6Q_UART || \
                                 DEBUG_IMX6SL_UART || \
                                 DEBUG_IMX6SX_UART
+       default "debug/ks8695.S" if DEBUG_KS8695_UART
        default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2

diff --git a/arch/arm/include/debug/ks8695.S b/arch/arm/include/debug/ks8695.S
new file mode 100644 (file)
index 0000000..961da1f
--- /dev/null
+++ b/arch/arm/include/debug/ks8695.S
@@ -0,0 +1,40 @@
+/*
+ * arch/arm/include/debug/ks8695.S
+ *
+ * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
+ * Copyright (C) 2006 Simtec Electronics
+ *
+ * KS8695 - Debug macros
+ *
+ * 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.
+ */
+
+#define KS8695_UART_PA 0x03ffe000
+#define KS8695_UART_VA 0xf00fe000
+#define KS8695_URTH    (0x04)
+#define KS8695_URLS    (0x14)
+#define URLS_URTE      (1 << 6)
+#define URLS_URTHRE    (1 << 5)
+
+       .macro  addruart, rp, rv, tmp
+               ldr     \rp, =KS8695_UART_PA            @ physical base address
+               ldr     \rv, =KS8695_UART_VA            @ virtual base address
+       .endm
+
+       .macro  senduart, rd, rx
+               str     \rd, [\rx, #KS8695_URTH]        @ Write to Transmit Holding Register
+       .endm
+
+       .macro  busyuart, rd, rx
+1001:          ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
+               tst     \rd, #URLS_URTE                 @ Holding & Shift registers empty?
+               beq     1001b
+       .endm
+
+       .macro  waituart, rd, rx
+1001:          ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
+               tst     \rd, #URLS_URTHRE               @ Holding Register empty?
+               beq     1001b
+       .endm

diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/mach-ks8695/include/mach/debug-macro.S
deleted file mode 100644 (file)
index a79e489..0000000
--- a/arch/arm/mach-ks8695/include/mach/debug-macro.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/arm/mach-ks8695/include/mach/debug-macro.S
- *
- * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
- * Copyright (C) 2006 Simtec Electronics
- *
- * KS8695 - Debug macros
- *
- * 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>
-#include <mach/regs-uart.h>
-
-       .macro  addruart, rp, rv, tmp
-               ldr     \rp, =KS8695_UART_PA            @ physical base address
-               ldr     \rv, =KS8695_UART_VA            @ virtual base address
-       .endm
-
-       .macro  senduart, rd, rx
-               str     \rd, [\rx, #KS8695_URTH]        @ Write to Transmit Holding Register
-       .endm
-
-       .macro  busyuart, rd, rx
-1001:          ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
-               tst     \rd, #URLS_URTE                 @ Holding & Shift registers empty?
-               beq     1001b
-       .endm
-
-       .macro  waituart, rd, rx
-1001:          ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
-               tst     \rd, #URLS_URTHRE               @ Holding Register empty?
-               beq     1001b
-       .endm