7 files changed, 76 insertions, 56 deletions

diff --git a/arch/arm/mach-s5p6440/include/mach/debug-macro.S b/arch/arm/mach-s5p6440/include/mach/debug-macro.S
index f3a5d1635be..48cdb0da026 100644
--- a/arch/arm/mach-s5p6440/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5p6440/include/mach/debug-macro.S
@@ -22,8 +22,8 @@
         .macro addruart, rx
                 mrc     p15, 0, \rx, c1, c0
                 tst     \rx, #1
-                ldreq   \rx, = S5P_PA_UART
-                ldrne   \rx, = (S5P_VA_UART + S5P_PA_UART & 0xfffff)
+                ldreq   \rx, = S3C_PA_UART
+                ldrne   \rx, = S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
                 add     \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
diff --git a/arch/arm/mach-s5p6440/include/mach/io.h b/arch/arm/mach-s5p6440/include/mach/io.h
new file mode 100644
index 00000000000..fa2d69cb1ad
--- /dev/null
+++ b/arch/arm/mach-s5p6440/include/mach/io.h
@@ -0,0 +1,18 @@
+/* arch/arm/mach-s5p6440/include/mach/io.h
+ *
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben-linux@fluff.org>
+ *
+ * Default IO routines for S3C64XX based
+ */
+
+#ifndef __ASM_ARM_ARCH_IO_H
+#define __ASM_ARM_ARCH_IO_H
+
+/* No current ISA/PCI bus support. */
+#define __io(a)         __typesafe_io(a)
+#define __mem_pci(a)    (a)
+
+#define IO_SPACE_LIMIT (0xFFFFFFFF)
+
+#endif
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h
index 4a73e73c942..8924e5a4d6a 100644
--- a/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@ -14,94 +14,55 @@
 #define __ASM_ARCH_MAP_H __FILE__
 
 #include <plat/map-base.h>
+#include <plat/map-s5p.h>
 
-/* Chip ID */
 #define S5P6440_PA_CHIPID       (0xE0000000)
 #define S5P_PA_CHIPID           S5P6440_PA_CHIPID
-#define S5P_VA_CHIPID           S3C_ADDR(0x00700000)
 
-/* SYSCON */
 #define S5P6440_PA_SYSCON       (0xE0100000)
-#define S5P_PA_SYSCON           S5P6440_PA_SYSCON
-#define S5P_VA_SYSCON           S3C_VA_SYS
-
 #define S5P6440_PA_CLK          (S5P6440_PA_SYSCON + 0x0)
-#define S5P_PA_CLK              S5P6440_PA_CLK
-#define S5P_VA_CLK              (S5P_VA_SYSCON + 0x0)
+#define S5P_PA_SYSCON           S5P6440_PA_SYSCON
 
-/* GPIO */
 #define S5P6440_PA_GPIO         (0xE0308000)
 #define S5P_PA_GPIO             S5P6440_PA_GPIO
-#define S5P_VA_GPIO             S3C_ADDR(0x00500000)
 
-/* VIC0 */
 #define S5P6440_PA_VIC0         (0xE4000000)
 #define S5P_PA_VIC0             S5P6440_PA_VIC0
-#define S5P_VA_VIC0             (S3C_VA_IRQ + 0x0)
-#define VA_VIC0                 S5P_VA_VIC0
 
-/* VIC1 */
 #define S5P6440_PA_VIC1         (0xE4100000)
 #define S5P_PA_VIC1             S5P6440_PA_VIC1
-#define S5P_VA_VIC1             (S3C_VA_IRQ + 0x10000)
-#define VA_VIC1                 S5P_VA_VIC1
 
-/* Timer */
 #define S5P6440_PA_TIMER        (0xEA000000)
 #define S5P_PA_TIMER            S5P6440_PA_TIMER
-#define S5P_VA_TIMER            S3C_VA_TIMER
 
-/* RTC */
 #define S5P6440_PA_RTC          (0xEA100000)
 #define S5P_PA_RTC              S5P6440_PA_RTC
-#define S5P_VA_RTC              S3C_ADDR(0x00600000)
 
-/* WDT */
 #define S5P6440_PA_WDT          (0xEA200000)
 #define S5P_PA_WDT              S5P6440_PA_WDT
-#define S5p_VA_WDT              S3C_VA_WATCHDOG
 
-/* UART */
 #define S5P6440_PA_UART         (0xEC000000)
-#define S5P_PA_UART             S5P6440_PA_UART
-#define S5P_VA_UART             S3C_VA_UART
 
-/* HS USB OtG */
+#define S5P_PA_UART0            (S5P6440_PA_UART + 0x0)
+#define S5P_PA_UART1            (S5P6440_PA_UART + 0x400)
+#define S5P_PA_UART2            (S5P6440_PA_UART + 0x800)
+#define S5P_PA_UART3            (S5P6440_PA_UART + 0xC00)
+
+#define S5P_SZ_UART             SZ_256
+
+#define S5P6440_PA_IIC0         (0xEC104000)
+
 #define S5P6440_PA_HSOTG        (0xED100000)
 
-/* HSMMC */
 #define S5P6440_PA_HSMMC0       (0xED800000)
 #define S5P6440_PA_HSMMC1       (0xED900000)
 #define S5P6440_PA_HSMMC2       (0xEDA00000)
 
-#define S5P_PA_UART0            (S5P_PA_UART + 0x0)
-#define S5P_PA_UART1            (S5P_PA_UART + 0x400)
-#define S5P_PA_UART2            (S5P_PA_UART + 0x800)
-#define S5P_PA_UART3            (S5P_PA_UART + 0xC00)
-#define S5P_UART_OFFSET         (0x400)
-
-#define S5P_VA_UARTx(x)         (S5P_VA_UART + (S5P_PA_UART & 0xfffff) \
-                                + ((x) * S5P_UART_OFFSET))
-
-#define S5P_VA_UART0            S5P_VA_UARTx(0)
-#define S5P_VA_UART1            S5P_VA_UARTx(1)
-#define S5P_VA_UART2            S5P_VA_UARTx(2)
-#define S5P_VA_UART3            S5P_VA_UARTx(3)
-#define S5P_SZ_UART             SZ_256
-
-/* I2C */
-#define S5P6440_PA_IIC0         (0xEC104000)
-#define S5P_PA_IIC0             S5P6440_PA_IIC0
-#define S5p_VA_IIC0             S3C_ADDR(0x00700000)
-
-/* SDRAM */
 #define S5P6440_PA_SDRAM        (0x20000000)
 #define S5P_PA_SDRAM            S5P6440_PA_SDRAM
 
 /* compatibiltiy defines. */
-#define S3C_PA_UART             S5P_PA_UART
-#define S3C_UART_OFFSET         S5P_UART_OFFSET
-#define S3C_PA_TIMER            S5P_PA_TIMER
-#define S3C_PA_IIC              S5P_PA_IIC0
+#define S3C_PA_UART             S5P6440_PA_UART
+#define S3C_PA_IIC              S5P6440_PA_IIC0
 
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5p6440/include/mach/regs-clock.h b/arch/arm/mach-s5p6440/include/mach/regs-clock.h
index b7af28342bc..c783ecc9f19 100644
--- a/arch/arm/mach-s5p6440/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5p6440/include/mach/regs-clock.h
@@ -15,7 +15,7 @@
 
 #include <mach/map.h>
 
-#define S5P_CLKREG(x)           (S5P_VA_CLK + (x))
+#define S5P_CLKREG(x)           (S3C_VA_SYS + (x))
 
 #define S5P_APLL_LOCK           S5P_CLKREG(0x00)
 #define S5P_MPLL_LOCK           S5P_CLKREG(0x04)
diff --git a/arch/arm/mach-s5p6440/include/mach/tick.h b/arch/arm/mach-s5p6440/include/mach/tick.h
index 0815aeb4f2c..2f25c7f0797 100644
--- a/arch/arm/mach-s5p6440/include/mach/tick.h
+++ b/arch/arm/mach-s5p6440/include/mach/tick.h
@@ -15,7 +15,7 @@
 
 static inline u32 s3c24xx_ostimer_pending(void)
 {
-        u32 pend = __raw_readl(S5P_VA_VIC0 + VIC_RAW_STATUS);
+        u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
         return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0)));
 }
 
diff --git a/arch/arm/mach-s5p6440/include/mach/timex.h b/arch/arm/mach-s5p6440/include/mach/timex.h
new file mode 100644
index 00000000000..fb2e8cd4082
--- /dev/null
+++ b/arch/arm/mach-s5p6440/include/mach/timex.h
@@ -0,0 +1,24 @@
+/* arch/arm/mach-s3c64xx/include/mach/timex.h
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C6400 - time parameters
+ *
+ * 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.
+*/
+
+#ifndef __ASM_ARCH_TIMEX_H
+#define __ASM_ARCH_TIMEX_H
+
+/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
+ * a variable is useless. It seems as long as we make our timers an
+ * exact multiple of HZ, any value that makes a 1->1 correspondence
+ * for the time conversion functions to/from jiffies is acceptable.
+*/
+
+#define CLOCK_TICK_RATE 12000000
+
+#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-s5p6440/include/mach/vmalloc.h b/arch/arm/mach-s5p6440/include/mach/vmalloc.h
new file mode 100644
index 00000000000..16df257b1dc
--- /dev/null
+++ b/arch/arm/mach-s5p6440/include/mach/vmalloc.h
@@ -0,0 +1,17 @@
+/* arch/arm/mach-s5p6440/include/mach/vmalloc.h
+ *
+ * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
+ *
+ * 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.
+ *
+ * S3C6400 vmalloc definition
+*/
+
+#ifndef __ASM_ARCH_VMALLOC_H
+#define __ASM_ARCH_VMALLOC_H
+
+#define VMALLOC_END       (0xE0000000)
+
+#endif /* __ASM_ARCH_VMALLOC_H */