ARM: S3C24XX: move debug-macro.S into the common space

Move debug-macro.S from mach/include to include/debug where
all other common debug macros are.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 104c8fb818ed00ec867ce4425ea91767738c4e46..4678870f8ee8d7a77b7586a70d0b4af3bbbf10d7 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1010,6 +1010,7 @@ config DEBUG_LL_INCLUDE
                                 DEBUG_IMX6SL_UART
        default "debug/msm.S" if DEBUG_MSM_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
+       default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
        default "debug/sti.S" if DEBUG_STI_UART
        default "debug/tegra.S" if DEBUG_TEGRA_UART

diff --git a/arch/arm/include/debug/s3c24xx.S b/arch/arm/include/debug/s3c24xx.S
new file mode 100644 (file)
index 0000000..b1f54dc
--- /dev/null
+++ b/arch/arm/include/debug/s3c24xx.S
@@ -0,0 +1,46 @@
+/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
+ *
+ * Debugging macro include header
+ *
+ *  Copyright (C) 1994-1999 Russell King
+ *  Copyright (C) 2005 Simtec Electronics
+ *
+ *  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 <linux/serial_s3c.h>
+
+#define S3C2410_UART1_OFF (0x4000)
+
+       .macro addruart, rp, rv, tmp
+               ldr     \rp, = CONFIG_DEBUG_UART_PHYS
+               ldr     \rv, = CONFIG_DEBUG_UART_VIRT
+       .endm
+
+       .macro  fifo_full_s3c2410 rd, rx
+               ldr     \rd, [\rx, # S3C2410_UFSTAT]
+               tst     \rd, #S3C2410_UFSTAT_TXFULL
+       .endm
+
+       .macro fifo_level_s3c2410 rd, rx
+               ldr     \rd, [\rx, # S3C2410_UFSTAT]
+               and     \rd, \rd, #S3C2410_UFSTAT_TXMASK
+       .endm
+
+/* Select the correct implementation depending on the configuration. The
+ * S3C2440 will get selected by default, as these are the most widely
+ * used variants of these
+*/
+
+#if defined(CONFIG_DEBUG_S3C2410_UART)
+#define fifo_full  fifo_full_s3c2410
+#define fifo_level fifo_level_s3c2410
+#endif
+
+/* include the reset of the code which will do the work */
+
+#include <debug/samsung.S>

diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
deleted file mode 100644 (file)
index b1f54dc..0000000
--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Copyright (C) 2005 Simtec Electronics
- *
- *  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 <linux/serial_s3c.h>
-
-#define S3C2410_UART1_OFF (0x4000)
-
-       .macro addruart, rp, rv, tmp
-               ldr     \rp, = CONFIG_DEBUG_UART_PHYS
-               ldr     \rv, = CONFIG_DEBUG_UART_VIRT
-       .endm
-
-       .macro  fifo_full_s3c2410 rd, rx
-               ldr     \rd, [\rx, # S3C2410_UFSTAT]
-               tst     \rd, #S3C2410_UFSTAT_TXFULL
-       .endm
-
-       .macro fifo_level_s3c2410 rd, rx
-               ldr     \rd, [\rx, # S3C2410_UFSTAT]
-               and     \rd, \rd, #S3C2410_UFSTAT_TXMASK
-       .endm
-
-/* Select the correct implementation depending on the configuration. The
- * S3C2440 will get selected by default, as these are the most widely
- * used variants of these
-*/
-
-#if defined(CONFIG_DEBUG_S3C2410_UART)
-#define fifo_full  fifo_full_s3c2410
-#define fifo_level fifo_level_s3c2410
-#endif
-
-/* include the reset of the code which will do the work */
-
-#include <debug/samsung.S>