1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/include/asm-arm/arch-s3c2410/debug-macro.S
index abfbe45cd17c..5f8223e700d3 100644
--- a/include/asm-arm/arch-s3c2410/debug-macro.S
+++ b/include/asm-arm/arch-s3c2410/debug-macro.S
@@ -25,7 +25,7 @@
                .macro addruart, rx
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1
-                ldreq   \rx, = S3C2410_PA_UART
+                ldreq   \rx, = S3C24XX_PA_UART
                ldrne   \rx, = S3C24XX_VA_UART
 #if CONFIG_DEBUG_S3C2410_UART != 0
                add     \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)
@@ -44,7 +44,7 @@
 1003:
                mrc     p15, 0, \rd, c1, c0
                tst     \rd, #1
-                addeq   \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART)
+                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) ]
@@ -75,7 +75,7 @@
 1003:
                mrc     p15, 0, \rd, c1, c0
                tst     \rd, #1
-                addeq   \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART)
+                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) ]

diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/include/asm-arm/arch-s3c2410/debug-macro.S index abfbe45cd17c..5f8223e700d3 100644 --- a/include/asm-arm/arch-s3c2410/debug-macro.S +++ b/include/asm-arm/arch-s3c2410/debug-macro.S
@@ -25,7 +25,7 @@
25	.macro addruart, rx	25	.macro addruart, rx
26	mrc p15, 0, \rx, c1, c0	26	mrc p15, 0, \rx, c1, c0
27	tst \rx, #1	27	tst \rx, #1
28	ldreq \rx, = S3C2410_PA_UART	28	ldreq \rx, = S3C24XX_PA_UART
29	ldrne \rx, = S3C24XX_VA_UART	29	ldrne \rx, = S3C24XX_VA_UART
30	#if CONFIG_DEBUG_S3C2410_UART != 0	30	#if CONFIG_DEBUG_S3C2410_UART != 0
31	add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)	31	add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)
@@ -44,7 +44,7 @@
44	1003:	44	1003:
45	mrc p15, 0, \rd, c1, c0	45	mrc p15, 0, \rd, c1, c0
46	tst \rd, #1	46	tst \rd, #1
47	addeq \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART)	47	addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
48	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)	48	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
49	bic \rd, \rd, #0xff000	49	bic \rd, \rd, #0xff000
50	ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]	50	ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
@@ -75,7 +75,7 @@
75	1003:	75	1003:
76	mrc p15, 0, \rd, c1, c0	76	mrc p15, 0, \rd, c1, c0
77	tst \rd, #1	77	tst \rd, #1
78	addeq \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART)	78	addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
79	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)	79	addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
80	bic \rd, \rd, #0xff000	80	bic \rd, \rd, #0xff000
81	ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]	81	ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]