aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-05-16 06:59:18 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-05-26 04:05:00 +0900
commit2cd62bd4e5226ae5fa61f58ade8148f2e4643335 (patch)
tree66feee48bd6ceca7e696da50d26de8586252f31c /arch/arm/mach-s3c24xx
parent1899de2894970fbeece3a97dd69d5321fb00972b (diff)
downloadlinux-linaro-stable-2cd62bd4e5226ae5fa61f58ade8148f2e4643335.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/debug-macro.S46
1 files changed, 0 insertions, 46 deletions
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
index b1f54dc4888c..000000000000
--- 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>