aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorChanghwan Youn <chaos.youn@samsung.com>2010-07-15 22:30:35 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 05:32:41 -0400
commit88baf2096c1c625c14831bc3438fd1e69bf1cef5 (patch)
tree92e956f6c47cfe58a066bb8cd07bc2cabd2a1a37 /arch/arm/plat-s5p
parent8b526ae4ddd7a62397d99856079b59eda5d09360 (diff)
ARM: S5P: Remove fixed uart offset dependent code
The uart offset between channels has been 0x400 for all S5P series and to present virtual and physical offsets, both number 0x400 and S3C_UART_OFFSET have been used together. This patch removes the use of the number 0x400 and expands the virtual mapping size of S3C_VA_UART from 4KB to 512KB to support the CPU with S3C_UART_OFFSET being 0x10000. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r--arch/arm/plat-s5p/cpu.c2
-rw-r--r--arch/arm/plat-s5p/include/plat/map-s5p.h11
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c
index 75cb8c37ca2c..c478441da68d 100644
--- a/arch/arm/plat-s5p/cpu.c
+++ b/arch/arm/plat-s5p/cpu.c
@@ -81,7 +81,7 @@ static struct map_desc s5p_iodesc[] __initdata = {
81 }, { 81 }, {
82 .virtual = (unsigned long)S3C_VA_UART, 82 .virtual = (unsigned long)S3C_VA_UART,
83 .pfn = __phys_to_pfn(S3C_PA_UART), 83 .pfn = __phys_to_pfn(S3C_PA_UART),
84 .length = SZ_4K, 84 .length = SZ_512K,
85 .type = MT_DEVICE, 85 .type = MT_DEVICE,
86 }, { 86 }, {
87 .virtual = (unsigned long)VA_VIC0, 87 .virtual = (unsigned long)VA_VIC0,
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
index 14828521f70c..3d815f43bb83 100644
--- a/arch/arm/plat-s5p/include/plat/map-s5p.h
+++ b/arch/arm/plat-s5p/include/plat/map-s5p.h
@@ -18,12 +18,15 @@
18#define S5P_VA_SYSTIMER S3C_ADDR(0x01200000) 18#define S5P_VA_SYSTIMER S3C_ADDR(0x01200000)
19#define S5P_VA_SROMC S3C_ADDR(0x01100000) 19#define S5P_VA_SROMC S3C_ADDR(0x01100000)
20 20
21#define S5P_VA_UART0 (S3C_VA_UART + 0x0) 21#define S5P_VA_UART(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
22#define S5P_VA_UART1 (S3C_VA_UART + 0x400) 22#define S5P_VA_UART0 S5P_VA_UART(0)
23#define S5P_VA_UART2 (S3C_VA_UART + 0x800) 23#define S5P_VA_UART1 S5P_VA_UART(1)
24#define S5P_VA_UART3 (S3C_VA_UART + 0xC00) 24#define S5P_VA_UART2 S5P_VA_UART(2)
25#define S5P_VA_UART3 S5P_VA_UART(3)
25 26
27#ifndef S3C_UART_OFFSET
26#define S3C_UART_OFFSET (0x400) 28#define S3C_UART_OFFSET (0x400)
29#endif
27 30
28#define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) 31#define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000))
29#define VA_VIC0 VA_VIC(0) 32#define VA_VIC0 VA_VIC(0)