diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-31 03:30:51 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-17 21:33:34 -0400 |
commit | 19a2c06548db1fa69c40be5bf3ad2095d6119871 (patch) | |
tree | c08194d0121bc5dae632aeba254ef641e46015c3 /arch/arm/mach-s5pc100/cpu.c | |
parent | 13904fba37aa00867dee0b4fe13df92fed1120f9 (diff) |
ARM: S5P: Moves initial map for merging S5P64X0
This patch moves some initial maps from plat-s5p to machine,
so that can merge mach-s5p6440 and mach-s5p6450.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pc100/cpu.c')
-rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index cd1afbce83e2..fd2708e7d8a9 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c | |||
@@ -1,5 +1,8 @@ | |||
1 | /* linux/arch/arm/mach-s5pc100/cpu.c | 1 | /* linux/arch/arm/mach-s5pc100/cpu.c |
2 | * | 2 | * |
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
3 | * Copyright 2009 Samsung Electronics Co. | 6 | * Copyright 2009 Samsung Electronics Co. |
4 | * Byungho Min <bhmin@samsung.com> | 7 | * Byungho Min <bhmin@samsung.com> |
5 | * | 8 | * |
@@ -57,11 +60,31 @@ static struct map_desc s5pc100_iodesc[] __initdata = { | |||
57 | .length = SZ_16K, | 60 | .length = SZ_16K, |
58 | .type = MT_DEVICE, | 61 | .type = MT_DEVICE, |
59 | }, { | 62 | }, { |
63 | .virtual = (unsigned long)S5P_VA_GPIO, | ||
64 | .pfn = __phys_to_pfn(S5PC100_PA_GPIO), | ||
65 | .length = SZ_4K, | ||
66 | .type = MT_DEVICE, | ||
67 | }, { | ||
68 | .virtual = (unsigned long)VA_VIC0, | ||
69 | .pfn = __phys_to_pfn(S5PC100_PA_VIC0), | ||
70 | .length = SZ_16K, | ||
71 | .type = MT_DEVICE, | ||
72 | }, { | ||
73 | .virtual = (unsigned long)VA_VIC1, | ||
74 | .pfn = __phys_to_pfn(S5PC100_PA_VIC1), | ||
75 | .length = SZ_16K, | ||
76 | .type = MT_DEVICE, | ||
77 | }, { | ||
60 | .virtual = (unsigned long)VA_VIC2, | 78 | .virtual = (unsigned long)VA_VIC2, |
61 | .pfn = __phys_to_pfn(S5P_PA_VIC2), | 79 | .pfn = __phys_to_pfn(S5PC100_PA_VIC2), |
62 | .length = SZ_16K, | 80 | .length = SZ_16K, |
63 | .type = MT_DEVICE, | 81 | .type = MT_DEVICE, |
64 | }, { | 82 | }, { |
83 | .virtual = (unsigned long)S3C_VA_UART, | ||
84 | .pfn = __phys_to_pfn(S3C_PA_UART), | ||
85 | .length = SZ_512K, | ||
86 | .type = MT_DEVICE, | ||
87 | }, { | ||
65 | .virtual = (unsigned long)S5PC100_VA_OTHERS, | 88 | .virtual = (unsigned long)S5PC100_VA_OTHERS, |
66 | .pfn = __phys_to_pfn(S5PC100_PA_OTHERS), | 89 | .pfn = __phys_to_pfn(S5PC100_PA_OTHERS), |
67 | .length = SZ_4K, | 90 | .length = SZ_4K, |