1 files changed, 0 insertions, 101 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 2f39737544c0..000000000000
--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,101 +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 <mach/map.h>
-#include <mach/regs-gpio.h>
-#include <linux/serial_s3c.h>
-#define S3C2410_UART1_OFF (0x4000)
-#define SHIFT_2440TXF (14-9)
-        .macro addruart, rp, rv, tmp
-                ldr     \rp, = S3C24XX_PA_UART
-                ldr     \rv, = S3C24XX_VA_UART
-#if CONFIG_DEBUG_S3C_UART != 0
-                add     \rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
-                add     \rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
-#endif
-        .endm
-        .macro fifo_full_s3c24xx rd, rx
-                @ check for arm920 vs arm926. currently assume all arm926
-                @ devices have an 64 byte FIFO identical to the s3c2440
-                mrc     p15, 0, \rd, c0, c0
-                and     \rd, \rd, #0xff0
-                teq     \rd, #0x260
-                beq     1004f
-                mrc     p15, 0, \rd, c1, c0
-                tst     \rd, #1
-                addeq   \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
-                addne   \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
-                bic     \rd, \rd, #0xff000
-                ldr     \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
-                and     \rd, \rd, #0x00ff0000
-                teq     \rd, #0x00440000                @ is it 2440?
-1004:
-                ldr     \rd, [\rx, # S3C2410_UFSTAT]
-                moveq   \rd, \rd, lsr #SHIFT_2440TXF
-                tst     \rd, #S3C2410_UFSTAT_TXFULL
-        .endm
-        .macro  fifo_full_s3c2410 rd, rx
-                ldr     \rd, [\rx, # S3C2410_UFSTAT]
-                tst     \rd, #S3C2410_UFSTAT_TXFULL
-        .endm
-/* fifo level reading */
-        .macro fifo_level_s3c24xx rd, rx
-                @ check for arm920 vs arm926. currently assume all arm926
-                @ devices have an 64 byte FIFO identical to the s3c2440
-                mrc     p15, 0, \rd, c0, c0
-                and     \rd, \rd, #0xff0
-                teq     \rd, #0x260
-                beq     10000f
-                mrc     p15, 0, \rd, c1, c0
-                tst     \rd, #1
-                addeq   \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
-                addne   \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
-                bic     \rd, \rd, #0xff000
-                ldr     \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
-                and     \rd, \rd, #0x00ff0000
-                teq     \rd, #0x00440000                @ is it 2440?
-10000:
-                ldr     \rd, [\rx, # S3C2410_UFSTAT]
-                andne   \rd, \rd, #S3C2410_UFSTAT_TXMASK
-                andeq   \rd, \rd, #S3C2440_UFSTAT_TXMASK
-        .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_CPU_LLSERIAL_S3C2410_ONLY)
-#define fifo_full  fifo_full_s3c2410
-#define fifo_level fifo_level_s3c2410
-#elif !defined(CONFIG_CPU_LLSERIAL_S3C2440_ONLY)
-#define fifo_full  fifo_full_s3c24xx
-#define fifo_level fifo_level_s3c24xx
-#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 index 2f39737544c0..000000000000 --- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S +++ /dev/null
@@ -1,101 +0,0 @@
1	/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
2	*
3	* Debugging macro include header
4	*
5	* Copyright (C) 1994-1999 Russell King
6	* Copyright (C) 2005 Simtec Electronics
7	*
8	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
9	*
10	* This program is free software; you can redistribute it and/or modify
11	* it under the terms of the GNU General Public License version 2 as
12	* published by the Free Software Foundation.
13	*/
14
15	#include <mach/map.h>
16	#include <mach/regs-gpio.h>
17	#include <linux/serial_s3c.h>
18
19	#define S3C2410_UART1_OFF (0x4000)
20	#define SHIFT_2440TXF (14-9)
21
22	.macro addruart, rp, rv, tmp
23	ldr \rp, = S3C24XX_PA_UART
24	ldr \rv, = S3C24XX_VA_UART
25	#if CONFIG_DEBUG_S3C_UART != 0
26	add \rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
27	add \rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
28	#endif
29	.endm
30
31	.macro fifo_full_s3c24xx rd, rx
32	@ check for arm920 vs arm926. currently assume all arm926
33	@ devices have an 64 byte FIFO identical to the s3c2440
34	mrc p15, 0, \rd, c0, c0
35	and \rd, \rd, #0xff0
36	teq \rd, #0x260
37	beq 1004f
38	mrc p15, 0, \rd, c1, c0
39	tst \rd, #1
40	addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
41	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
42	bic \rd, \rd, #0xff000
43	ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
44	and \rd, \rd, #0x00ff0000
45	teq \rd, #0x00440000 @ is it 2440?
46	1004:
47	ldr \rd, [\rx, # S3C2410_UFSTAT]
48	moveq \rd, \rd, lsr #SHIFT_2440TXF
49	tst \rd, #S3C2410_UFSTAT_TXFULL
50	.endm
51
52	.macro fifo_full_s3c2410 rd, rx
53	ldr \rd, [\rx, # S3C2410_UFSTAT]
54	tst \rd, #S3C2410_UFSTAT_TXFULL
55	.endm
56
57	/* fifo level reading */
58
59	.macro fifo_level_s3c24xx rd, rx
60	@ check for arm920 vs arm926. currently assume all arm926
61	@ devices have an 64 byte FIFO identical to the s3c2440
62	mrc p15, 0, \rd, c0, c0
63	and \rd, \rd, #0xff0
64	teq \rd, #0x260
65	beq 10000f
66	mrc p15, 0, \rd, c1, c0
67	tst \rd, #1
68	addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
69	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
70	bic \rd, \rd, #0xff000
71	ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
72	and \rd, \rd, #0x00ff0000
73	teq \rd, #0x00440000 @ is it 2440?
74
75	10000:
76	ldr \rd, [\rx, # S3C2410_UFSTAT]
77	andne \rd, \rd, #S3C2410_UFSTAT_TXMASK
78	andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK
79	.endm
80
81	.macro fifo_level_s3c2410 rd, rx
82	ldr \rd, [\rx, # S3C2410_UFSTAT]
83	and \rd, \rd, #S3C2410_UFSTAT_TXMASK
84	.endm
85
86	/* Select the correct implementation depending on the configuration. The
87	* S3C2440 will get selected by default, as these are the most widely
88	* used variants of these
89	*/
90
91	#if defined(CONFIG_CPU_LLSERIAL_S3C2410_ONLY)
92	#define fifo_full fifo_full_s3c2410
93	#define fifo_level fifo_level_s3c2410
94	#elif !defined(CONFIG_CPU_LLSERIAL_S3C2440_ONLY)
95	#define fifo_full fifo_full_s3c24xx
96	#define fifo_level fifo_level_s3c24xx
97	#endif
98
99	/* include the reset of the code which will do the work */
100
101	#include <debug/samsung.S>