diff options
-rw-r--r-- | arch/arm/mach-s5p6440/cpu.c | 37 | ||||
-rw-r--r-- | arch/arm/mach-s5p6440/include/mach/map.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-s5p6442/cpu.c | 27 | ||||
-rw-r--r-- | arch/arm/mach-s5p6442/include/mach/map.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 25 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 11 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 22 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 26 | ||||
-rw-r--r-- | arch/arm/plat-s5p/cpu.c | 22 |
10 files changed, 125 insertions, 66 deletions
diff --git a/arch/arm/mach-s5p6440/cpu.c b/arch/arm/mach-s5p6440/cpu.c index ec592e866054..8a09e0fc2730 100644 --- a/arch/arm/mach-s5p6440/cpu.c +++ b/arch/arm/mach-s5p6440/cpu.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* linux/arch/arm/mach-s5p6440/cpu.c | 1 | /* linux/arch/arm/mach-s5p6440/cpu.c |
2 | * | 2 | * |
3 | * Copyright (c) 2009 Samsung Electronics Co., Ltd. | 3 | * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com/ | 4 | * http://www.samsung.com |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
@@ -40,6 +40,32 @@ | |||
40 | #include <plat/s5p6440.h> | 40 | #include <plat/s5p6440.h> |
41 | #include <plat/adc-core.h> | 41 | #include <plat/adc-core.h> |
42 | 42 | ||
43 | /* Initial IO mappings */ | ||
44 | |||
45 | static struct map_desc s5p6440_iodesc[] __initdata = { | ||
46 | { | ||
47 | .virtual = (unsigned long)S5P_VA_GPIO, | ||
48 | .pfn = __phys_to_pfn(S5P6440_PA_GPIO), | ||
49 | .length = SZ_4K, | ||
50 | .type = MT_DEVICE, | ||
51 | }, { | ||
52 | .virtual = (unsigned long)VA_VIC0, | ||
53 | .pfn = __phys_to_pfn(S5P6440_PA_VIC0), | ||
54 | .length = SZ_16K, | ||
55 | .type = MT_DEVICE, | ||
56 | }, { | ||
57 | .virtual = (unsigned long)VA_VIC1, | ||
58 | .pfn = __phys_to_pfn(S5P6440_PA_VIC1), | ||
59 | .length = SZ_16K, | ||
60 | .type = MT_DEVICE, | ||
61 | }, { | ||
62 | .virtual = (unsigned long)S3C_VA_UART, | ||
63 | .pfn = __phys_to_pfn(S3C_PA_UART), | ||
64 | .length = SZ_512K, | ||
65 | .type = MT_DEVICE, | ||
66 | } | ||
67 | }; | ||
68 | |||
43 | static void s5p6440_idle(void) | 69 | static void s5p6440_idle(void) |
44 | { | 70 | { |
45 | unsigned long val; | 71 | unsigned long val; |
@@ -55,15 +81,18 @@ static void s5p6440_idle(void) | |||
55 | local_irq_enable(); | 81 | local_irq_enable(); |
56 | } | 82 | } |
57 | 83 | ||
58 | /* s5p6440_map_io | 84 | /* |
85 | * s5p6440_map_io | ||
59 | * | 86 | * |
60 | * register the standard cpu IO areas | 87 | * register the standard cpu IO areas |
61 | */ | 88 | */ |
62 | 89 | ||
63 | void __init s5p6440_map_io(void) | 90 | void __init s5p6440_map_io(void) |
64 | { | 91 | { |
65 | /* initialize any device information early */ | 92 | /* initialize any device information early */ |
66 | s3c_adc_setname("s3c64xx-adc"); | 93 | s3c_adc_setname("s3c64xx-adc"); |
94 | |||
95 | iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); | ||
67 | } | 96 | } |
68 | 97 | ||
69 | void __init s5p6440_init_clocks(int xtal) | 98 | void __init s5p6440_init_clocks(int xtal) |
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h index 6cc5cbc88ffb..11d31fe87ccf 100644 --- a/arch/arm/mach-s5p6440/include/mach/map.h +++ b/arch/arm/mach-s5p6440/include/mach/map.h | |||
@@ -24,23 +24,18 @@ | |||
24 | #define S5P_PA_SYSCON S5P6440_PA_SYSCON | 24 | #define S5P_PA_SYSCON S5P6440_PA_SYSCON |
25 | 25 | ||
26 | #define S5P6440_PA_GPIO (0xE0308000) | 26 | #define S5P6440_PA_GPIO (0xE0308000) |
27 | #define S5P_PA_GPIO S5P6440_PA_GPIO | ||
28 | 27 | ||
29 | #define S5P6440_PA_VIC0 (0xE4000000) | 28 | #define S5P6440_PA_VIC0 (0xE4000000) |
30 | #define S5P_PA_VIC0 S5P6440_PA_VIC0 | 29 | #define S5P6440_PA_VIC1 (0xE4100000) |
31 | 30 | ||
32 | #define S5P6440_PA_PDMA 0xE9000000 | 31 | #define S5P6440_PA_PDMA 0xE9000000 |
33 | 32 | ||
34 | #define S5P6440_PA_VIC1 (0xE4100000) | ||
35 | #define S5P_PA_VIC1 S5P6440_PA_VIC1 | ||
36 | |||
37 | #define S5P6440_PA_TIMER (0xEA000000) | 33 | #define S5P6440_PA_TIMER (0xEA000000) |
38 | #define S5P_PA_TIMER S5P6440_PA_TIMER | 34 | #define S5P_PA_TIMER S5P6440_PA_TIMER |
39 | 35 | ||
40 | #define S5P6440_PA_RTC (0xEA100000) | 36 | #define S5P6440_PA_RTC (0xEA100000) |
41 | 37 | ||
42 | #define S5P6440_PA_WDT (0xEA200000) | 38 | #define S5P6440_PA_WDT (0xEA200000) |
43 | #define S5P_PA_WDT S5P6440_PA_WDT | ||
44 | 39 | ||
45 | #define S5P6440_PA_UART (0xEC000000) | 40 | #define S5P6440_PA_UART (0xEC000000) |
46 | 41 | ||
diff --git a/arch/arm/mach-s5p6442/cpu.c b/arch/arm/mach-s5p6442/cpu.c index 70ac681af72b..842af86bda6d 100644 --- a/arch/arm/mach-s5p6442/cpu.c +++ b/arch/arm/mach-s5p6442/cpu.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* linux/arch/arm/mach-s5p6442/cpu.c | 1 | /* linux/arch/arm/mach-s5p6442/cpu.c |
2 | * | 2 | * |
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com/ | 4 | * http://www.samsung.com |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
@@ -48,10 +48,30 @@ static struct map_desc s5p6442_iodesc[] __initdata = { | |||
48 | .length = SZ_16K, | 48 | .length = SZ_16K, |
49 | .type = MT_DEVICE, | 49 | .type = MT_DEVICE, |
50 | }, { | 50 | }, { |
51 | .virtual = (unsigned long)S5P_VA_GPIO, | ||
52 | .pfn = __phys_to_pfn(S5P6442_PA_GPIO), | ||
53 | .length = SZ_4K, | ||
54 | .type = MT_DEVICE, | ||
55 | }, { | ||
56 | .virtual = (unsigned long)VA_VIC0, | ||
57 | .pfn = __phys_to_pfn(S5P6442_PA_VIC0), | ||
58 | .length = SZ_16K, | ||
59 | .type = MT_DEVICE, | ||
60 | }, { | ||
61 | .virtual = (unsigned long)VA_VIC1, | ||
62 | .pfn = __phys_to_pfn(S5P6442_PA_VIC1), | ||
63 | .length = SZ_16K, | ||
64 | .type = MT_DEVICE, | ||
65 | }, { | ||
51 | .virtual = (unsigned long)VA_VIC2, | 66 | .virtual = (unsigned long)VA_VIC2, |
52 | .pfn = __phys_to_pfn(S5P6442_PA_VIC2), | 67 | .pfn = __phys_to_pfn(S5P6442_PA_VIC2), |
53 | .length = SZ_16K, | 68 | .length = SZ_16K, |
54 | .type = MT_DEVICE, | 69 | .type = MT_DEVICE, |
70 | }, { | ||
71 | .virtual = (unsigned long)S3C_VA_UART, | ||
72 | .pfn = __phys_to_pfn(S3C_PA_UART), | ||
73 | .length = SZ_512K, | ||
74 | .type = MT_DEVICE, | ||
55 | } | 75 | } |
56 | }; | 76 | }; |
57 | 77 | ||
@@ -63,10 +83,11 @@ static void s5p6442_idle(void) | |||
63 | local_irq_enable(); | 83 | local_irq_enable(); |
64 | } | 84 | } |
65 | 85 | ||
66 | /* s5p6442_map_io | 86 | /* |
87 | * s5p6442_map_io | ||
67 | * | 88 | * |
68 | * register the standard cpu IO areas | 89 | * register the standard cpu IO areas |
69 | */ | 90 | */ |
70 | 91 | ||
71 | void __init s5p6442_map_io(void) | 92 | void __init s5p6442_map_io(void) |
72 | { | 93 | { |
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h index 281d256faafb..31fb2e68d527 100644 --- a/arch/arm/mach-s5p6442/include/mach/map.h +++ b/arch/arm/mach-s5p6442/include/mach/map.h | |||
@@ -23,16 +23,10 @@ | |||
23 | #define S5P_PA_SYSCON S5P6442_PA_SYSCON | 23 | #define S5P_PA_SYSCON S5P6442_PA_SYSCON |
24 | 24 | ||
25 | #define S5P6442_PA_GPIO (0xE0200000) | 25 | #define S5P6442_PA_GPIO (0xE0200000) |
26 | #define S5P_PA_GPIO S5P6442_PA_GPIO | ||
27 | 26 | ||
28 | #define S5P6442_PA_VIC0 (0xE4000000) | 27 | #define S5P6442_PA_VIC0 (0xE4000000) |
29 | #define S5P_PA_VIC0 S5P6442_PA_VIC0 | ||
30 | |||
31 | #define S5P6442_PA_VIC1 (0xE4100000) | 28 | #define S5P6442_PA_VIC1 (0xE4100000) |
32 | #define S5P_PA_VIC1 S5P6442_PA_VIC1 | ||
33 | |||
34 | #define S5P6442_PA_VIC2 (0xE4200000) | 29 | #define S5P6442_PA_VIC2 (0xE4200000) |
35 | #define S5P_PA_VIC2 S5P6442_PA_VIC2 | ||
36 | 30 | ||
37 | #define S5P6442_PA_MDMA 0xE8000000 | 31 | #define S5P6442_PA_MDMA 0xE8000000 |
38 | #define S5P6442_PA_PDMA 0xE9000000 | 32 | #define S5P6442_PA_PDMA 0xE9000000 |
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, |
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 01b9134feff0..8751ef4a6804 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h | |||
@@ -44,19 +44,16 @@ | |||
44 | #define S5PC100_PA_OTHERS (0xE0200000) | 44 | #define S5PC100_PA_OTHERS (0xE0200000) |
45 | #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000) | 45 | #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000) |
46 | 46 | ||
47 | #define S5P_PA_GPIO (0xE0300000) | 47 | #define S5PC100_PA_GPIO (0xE0300000) |
48 | #define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000) | 48 | #define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000) |
49 | 49 | ||
50 | /* Interrupt */ | 50 | /* Interrupt */ |
51 | #define S5PC100_PA_VIC (0xE4000000) | 51 | #define S5PC100_PA_VIC0 (0xE4000000) |
52 | #define S5PC100_PA_VIC1 (0xE4100000) | ||
53 | #define S5PC100_PA_VIC2 (0xE4200000) | ||
52 | #define S5PC100_VA_VIC S3C_VA_IRQ | 54 | #define S5PC100_VA_VIC S3C_VA_IRQ |
53 | #define S5PC100_PA_VIC_OFFSET 0x100000 | ||
54 | #define S5PC100_VA_VIC_OFFSET 0x10000 | 55 | #define S5PC100_VA_VIC_OFFSET 0x10000 |
55 | #define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET)) | ||
56 | #define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET)) | 56 | #define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET)) |
57 | #define S5P_PA_VIC0 S5PC1XX_PA_VIC(0) | ||
58 | #define S5P_PA_VIC1 S5PC1XX_PA_VIC(1) | ||
59 | #define S5P_PA_VIC2 S5PC1XX_PA_VIC(2) | ||
60 | 57 | ||
61 | 58 | ||
62 | #define S5PC100_PA_ONENAND (0xE7100000) | 59 | #define S5PC100_PA_ONENAND (0xE7100000) |
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 245b82b53df4..2f16bfc0a116 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* linux/arch/arm/mach-s5pv210/cpu.c | 1 | /* linux/arch/arm/mach-s5pv210/cpu.c |
2 | * | 2 | * |
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com/ | 4 | * http://www.samsung.com |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
@@ -51,6 +51,21 @@ static struct map_desc s5pv210_iodesc[] __initdata = { | |||
51 | .length = SZ_4K, | 51 | .length = SZ_4K, |
52 | .type = MT_DEVICE, | 52 | .type = MT_DEVICE, |
53 | }, { | 53 | }, { |
54 | .virtual = (unsigned long)S5P_VA_GPIO, | ||
55 | .pfn = __phys_to_pfn(S5PV210_PA_GPIO), | ||
56 | .length = SZ_4K, | ||
57 | .type = MT_DEVICE, | ||
58 | }, { | ||
59 | .virtual = (unsigned long)VA_VIC0, | ||
60 | .pfn = __phys_to_pfn(S5PV210_PA_VIC0), | ||
61 | .length = SZ_16K, | ||
62 | .type = MT_DEVICE, | ||
63 | }, { | ||
64 | .virtual = (unsigned long)VA_VIC1, | ||
65 | .pfn = __phys_to_pfn(S5PV210_PA_VIC1), | ||
66 | .length = SZ_16K, | ||
67 | .type = MT_DEVICE, | ||
68 | }, { | ||
54 | .virtual = (unsigned long)VA_VIC2, | 69 | .virtual = (unsigned long)VA_VIC2, |
55 | .pfn = __phys_to_pfn(S5PV210_PA_VIC2), | 70 | .pfn = __phys_to_pfn(S5PV210_PA_VIC2), |
56 | .length = SZ_16K, | 71 | .length = SZ_16K, |
@@ -61,6 +76,11 @@ static struct map_desc s5pv210_iodesc[] __initdata = { | |||
61 | .length = SZ_16K, | 76 | .length = SZ_16K, |
62 | .type = MT_DEVICE, | 77 | .type = MT_DEVICE, |
63 | }, { | 78 | }, { |
79 | .virtual = (unsigned long)S3C_VA_UART, | ||
80 | .pfn = __phys_to_pfn(S3C_PA_UART), | ||
81 | .length = SZ_512K, | ||
82 | .type = MT_DEVICE, | ||
83 | }, { | ||
64 | .virtual = (unsigned long)S5P_VA_SROMC, | 84 | .virtual = (unsigned long)S5P_VA_SROMC, |
65 | .pfn = __phys_to_pfn(S5PV210_PA_SROMC), | 85 | .pfn = __phys_to_pfn(S5PV210_PA_SROMC), |
66 | .length = SZ_4K, | 86 | .length = SZ_4K, |
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index aa19d2f8dadb..bd9afd52466a 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define S5P_PA_SYSCON S5PV210_PA_SYSCON | 29 | #define S5P_PA_SYSCON S5PV210_PA_SYSCON |
30 | 30 | ||
31 | #define S5PV210_PA_GPIO (0xE0200000) | 31 | #define S5PV210_PA_GPIO (0xE0200000) |
32 | #define S5P_PA_GPIO S5PV210_PA_GPIO | ||
33 | 32 | ||
34 | /* SPI */ | 33 | /* SPI */ |
35 | #define S5PV210_PA_SPI0 0xE1300000 | 34 | #define S5PV210_PA_SPI0 0xE1300000 |
@@ -75,16 +74,9 @@ | |||
75 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) | 74 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) |
76 | 75 | ||
77 | #define S5PV210_PA_VIC0 (0xF2000000) | 76 | #define S5PV210_PA_VIC0 (0xF2000000) |
78 | #define S5P_PA_VIC0 S5PV210_PA_VIC0 | ||
79 | |||
80 | #define S5PV210_PA_VIC1 (0xF2100000) | 77 | #define S5PV210_PA_VIC1 (0xF2100000) |
81 | #define S5P_PA_VIC1 S5PV210_PA_VIC1 | ||
82 | |||
83 | #define S5PV210_PA_VIC2 (0xF2200000) | 78 | #define S5PV210_PA_VIC2 (0xF2200000) |
84 | #define S5P_PA_VIC2 S5PV210_PA_VIC2 | ||
85 | |||
86 | #define S5PV210_PA_VIC3 (0xF2300000) | 79 | #define S5PV210_PA_VIC3 (0xF2300000) |
87 | #define S5P_PA_VIC3 S5PV210_PA_VIC3 | ||
88 | 80 | ||
89 | #define S5PV210_PA_SDRAM (0x20000000) | 81 | #define S5PV210_PA_SDRAM (0x20000000) |
90 | #define S5P_PA_SDRAM S5PV210_PA_SDRAM | 82 | #define S5P_PA_SDRAM S5PV210_PA_SDRAM |
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c index e5b261a99ab2..3b9c872ed68d 100644 --- a/arch/arm/mach-s5pv310/cpu.c +++ b/arch/arm/mach-s5pv310/cpu.c | |||
@@ -31,9 +31,14 @@ extern void combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq); | |||
31 | /* Initial IO mappings */ | 31 | /* Initial IO mappings */ |
32 | static struct map_desc s5pv310_iodesc[] __initdata = { | 32 | static struct map_desc s5pv310_iodesc[] __initdata = { |
33 | { | 33 | { |
34 | .virtual = (unsigned long)S5P_VA_COREPERI_BASE, | 34 | .virtual = (unsigned long)S5P_VA_SYSRAM, |
35 | .pfn = __phys_to_pfn(S5PV310_PA_COREPERI), | 35 | .pfn = __phys_to_pfn(S5PV310_PA_SYSRAM), |
36 | .length = SZ_8K, | 36 | .length = SZ_4K, |
37 | .type = MT_DEVICE, | ||
38 | }, { | ||
39 | .virtual = (unsigned long)S5P_VA_CMU, | ||
40 | .pfn = __phys_to_pfn(S5PV310_PA_CMU), | ||
41 | .length = SZ_128K, | ||
37 | .type = MT_DEVICE, | 42 | .type = MT_DEVICE, |
38 | }, { | 43 | }, { |
39 | .virtual = (unsigned long)S5P_VA_COMBINER_BASE, | 44 | .virtual = (unsigned long)S5P_VA_COMBINER_BASE, |
@@ -41,19 +46,24 @@ static struct map_desc s5pv310_iodesc[] __initdata = { | |||
41 | .length = SZ_4K, | 46 | .length = SZ_4K, |
42 | .type = MT_DEVICE, | 47 | .type = MT_DEVICE, |
43 | }, { | 48 | }, { |
49 | .virtual = (unsigned long)S5P_VA_COREPERI_BASE, | ||
50 | .pfn = __phys_to_pfn(S5PV310_PA_COREPERI), | ||
51 | .length = SZ_8K, | ||
52 | .type = MT_DEVICE, | ||
53 | }, { | ||
44 | .virtual = (unsigned long)S5P_VA_L2CC, | 54 | .virtual = (unsigned long)S5P_VA_L2CC, |
45 | .pfn = __phys_to_pfn(S5PV310_PA_L2CC), | 55 | .pfn = __phys_to_pfn(S5PV310_PA_L2CC), |
46 | .length = SZ_4K, | 56 | .length = SZ_4K, |
47 | .type = MT_DEVICE, | 57 | .type = MT_DEVICE, |
48 | }, { | 58 | }, { |
49 | .virtual = (unsigned long)S5P_VA_SYSRAM, | 59 | .virtual = (unsigned long)S5P_VA_GPIO, |
50 | .pfn = __phys_to_pfn(S5PV310_PA_SYSRAM), | 60 | .pfn = __phys_to_pfn(S5PV310_PA_GPIO), |
51 | .length = SZ_4K, | 61 | .length = SZ_4K, |
52 | .type = MT_DEVICE, | 62 | .type = MT_DEVICE, |
53 | }, { | 63 | }, { |
54 | .virtual = (unsigned long)S5P_VA_CMU, | 64 | .virtual = (unsigned long)S3C_VA_UART, |
55 | .pfn = __phys_to_pfn(S5PV310_PA_CMU), | 65 | .pfn = __phys_to_pfn(S3C_PA_UART), |
56 | .length = SZ_128K, | 66 | .length = SZ_512K, |
57 | .type = MT_DEVICE, | 67 | .type = MT_DEVICE, |
58 | }, | 68 | }, |
59 | }; | 69 | }; |
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index b07a078fd284..57f08eee6d62 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c | |||
@@ -89,33 +89,11 @@ static struct map_desc s5p_iodesc[] __initdata = { | |||
89 | .length = SZ_64K, | 89 | .length = SZ_64K, |
90 | .type = MT_DEVICE, | 90 | .type = MT_DEVICE, |
91 | }, { | 91 | }, { |
92 | .virtual = (unsigned long)S3C_VA_UART, | ||
93 | .pfn = __phys_to_pfn(S3C_PA_UART), | ||
94 | .length = SZ_512K, | ||
95 | .type = MT_DEVICE, | ||
96 | #ifdef CONFIG_ARM_VIC | ||
97 | }, { | ||
98 | .virtual = (unsigned long)VA_VIC0, | ||
99 | .pfn = __phys_to_pfn(S5P_PA_VIC0), | ||
100 | .length = SZ_16K, | ||
101 | .type = MT_DEVICE, | ||
102 | }, { | ||
103 | .virtual = (unsigned long)VA_VIC1, | ||
104 | .pfn = __phys_to_pfn(S5P_PA_VIC1), | ||
105 | .length = SZ_16K, | ||
106 | .type = MT_DEVICE, | ||
107 | #endif | ||
108 | }, { | ||
109 | .virtual = (unsigned long)S3C_VA_TIMER, | 92 | .virtual = (unsigned long)S3C_VA_TIMER, |
110 | .pfn = __phys_to_pfn(S5P_PA_TIMER), | 93 | .pfn = __phys_to_pfn(S5P_PA_TIMER), |
111 | .length = SZ_16K, | 94 | .length = SZ_16K, |
112 | .type = MT_DEVICE, | 95 | .type = MT_DEVICE, |
113 | }, { | 96 | }, { |
114 | .virtual = (unsigned long)S5P_VA_GPIO, | ||
115 | .pfn = __phys_to_pfn(S5P_PA_GPIO), | ||
116 | .length = SZ_4K, | ||
117 | .type = MT_DEVICE, | ||
118 | }, { | ||
119 | .virtual = (unsigned long)S3C_VA_WATCHDOG, | 97 | .virtual = (unsigned long)S3C_VA_WATCHDOG, |
120 | .pfn = __phys_to_pfn(S3C_PA_WDT), | 98 | .pfn = __phys_to_pfn(S3C_PA_WDT), |
121 | .length = SZ_4K, | 99 | .length = SZ_4K, |