diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-netstar.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 3 |
9 files changed, 18 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index bdc20b51b076..a177e78b2b87 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | static void __init omap_generic_init_irq(void) | 31 | static void __init omap_generic_init_irq(void) |
32 | { | 32 | { |
33 | omap1_init_common_hw(); | ||
33 | omap_init_irq(); | 34 | omap_init_irq(); |
34 | } | 35 | } |
35 | 36 | ||
@@ -104,7 +105,7 @@ static void __init omap_generic_init(void) | |||
104 | 105 | ||
105 | static void __init omap_generic_map_io(void) | 106 | static void __init omap_generic_map_io(void) |
106 | { | 107 | { |
107 | omap_map_common_io(); | 108 | omap1_map_common_io(); |
108 | } | 109 | } |
109 | 110 | ||
110 | MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") | 111 | MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 9533c36a92df..89f0cc74a519 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -128,6 +128,7 @@ static void __init h2_init_smc91x(void) | |||
128 | 128 | ||
129 | static void __init h2_init_irq(void) | 129 | static void __init h2_init_irq(void) |
130 | { | 130 | { |
131 | omap1_init_common_hw(); | ||
131 | omap_init_irq(); | 132 | omap_init_irq(); |
132 | omap_gpio_init(); | 133 | omap_gpio_init(); |
133 | h2_init_smc91x(); | 134 | h2_init_smc91x(); |
@@ -194,7 +195,7 @@ static void __init h2_init(void) | |||
194 | 195 | ||
195 | static void __init h2_map_io(void) | 196 | static void __init h2_map_io(void) |
196 | { | 197 | { |
197 | omap_map_common_io(); | 198 | omap1_map_common_io(); |
198 | } | 199 | } |
199 | 200 | ||
200 | MACHINE_START(OMAP_H2, "TI-H2") | 201 | MACHINE_START(OMAP_H2, "TI-H2") |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index d665efc1c344..d9f386265996 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -203,6 +203,7 @@ static void __init h3_init_smc91x(void) | |||
203 | 203 | ||
204 | void h3_init_irq(void) | 204 | void h3_init_irq(void) |
205 | { | 205 | { |
206 | omap1_init_common_hw(); | ||
206 | omap_init_irq(); | 207 | omap_init_irq(); |
207 | omap_gpio_init(); | 208 | omap_gpio_init(); |
208 | h3_init_smc91x(); | 209 | h3_init_smc91x(); |
@@ -210,7 +211,7 @@ void h3_init_irq(void) | |||
210 | 211 | ||
211 | static void __init h3_map_io(void) | 212 | static void __init h3_map_io(void) |
212 | { | 213 | { |
213 | omap_map_common_io(); | 214 | omap1_map_common_io(); |
214 | } | 215 | } |
215 | 216 | ||
216 | MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board") | 217 | MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board") |
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 652f37c7f906..a04e4332915e 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -181,6 +181,7 @@ static void __init innovator_init_smc91x(void) | |||
181 | 181 | ||
182 | void innovator_init_irq(void) | 182 | void innovator_init_irq(void) |
183 | { | 183 | { |
184 | omap1_init_common_hw(); | ||
184 | omap_init_irq(); | 185 | omap_init_irq(); |
185 | omap_gpio_init(); | 186 | omap_gpio_init(); |
186 | #ifdef CONFIG_ARCH_OMAP15XX | 187 | #ifdef CONFIG_ARCH_OMAP15XX |
@@ -285,7 +286,7 @@ static void __init innovator_init(void) | |||
285 | 286 | ||
286 | static void __init innovator_map_io(void) | 287 | static void __init innovator_map_io(void) |
287 | { | 288 | { |
288 | omap_map_common_io(); | 289 | omap1_map_common_io(); |
289 | 290 | ||
290 | #ifdef CONFIG_ARCH_OMAP15XX | 291 | #ifdef CONFIG_ARCH_OMAP15XX |
291 | if (cpu_is_omap1510()) { | 292 | if (cpu_is_omap1510()) { |
diff --git a/arch/arm/mach-omap1/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c index 58f783930d45..60d5f8a3339c 100644 --- a/arch/arm/mach-omap1/board-netstar.c +++ b/arch/arm/mach-omap1/board-netstar.c | |||
@@ -65,6 +65,7 @@ static struct omap_board_config_kernel netstar_config[] = { | |||
65 | 65 | ||
66 | static void __init netstar_init_irq(void) | 66 | static void __init netstar_init_irq(void) |
67 | { | 67 | { |
68 | omap1_init_common_hw(); | ||
68 | omap_init_irq(); | 69 | omap_init_irq(); |
69 | omap_gpio_init(); | 70 | omap_gpio_init(); |
70 | } | 71 | } |
@@ -108,7 +109,7 @@ static void __init netstar_init(void) | |||
108 | 109 | ||
109 | static void __init netstar_map_io(void) | 110 | static void __init netstar_map_io(void) |
110 | { | 111 | { |
111 | omap_map_common_io(); | 112 | omap1_map_common_io(); |
112 | } | 113 | } |
113 | 114 | ||
114 | #define MACHINE_PANICED 1 | 115 | #define MACHINE_PANICED 1 |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index e5d126e8f276..543fa136106d 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -169,6 +169,7 @@ static void __init osk_init_cf(void) | |||
169 | 169 | ||
170 | static void __init osk_init_irq(void) | 170 | static void __init osk_init_irq(void) |
171 | { | 171 | { |
172 | omap1_init_common_hw(); | ||
172 | omap_init_irq(); | 173 | omap_init_irq(); |
173 | omap_gpio_init(); | 174 | omap_gpio_init(); |
174 | osk_init_smc91x(); | 175 | osk_init_smc91x(); |
@@ -269,7 +270,7 @@ static void __init osk_init(void) | |||
269 | 270 | ||
270 | static void __init osk_map_io(void) | 271 | static void __init osk_map_io(void) |
271 | { | 272 | { |
272 | omap_map_common_io(); | 273 | omap1_map_common_io(); |
273 | } | 274 | } |
274 | 275 | ||
275 | MACHINE_START(OMAP_OSK, "TI-OSK") | 276 | MACHINE_START(OMAP_OSK, "TI-OSK") |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 67fada207622..e488f7236775 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | static void __init omap_generic_init_irq(void) | 35 | static void __init omap_generic_init_irq(void) |
36 | { | 36 | { |
37 | omap1_init_common_hw(); | ||
37 | omap_init_irq(); | 38 | omap_init_irq(); |
38 | } | 39 | } |
39 | 40 | ||
@@ -72,7 +73,7 @@ static void __init omap_generic_init(void) | |||
72 | 73 | ||
73 | static void __init omap_generic_map_io(void) | 74 | static void __init omap_generic_map_io(void) |
74 | { | 75 | { |
75 | omap_map_common_io(); | 76 | omap1_map_common_io(); |
76 | } | 77 | } |
77 | 78 | ||
78 | MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") | 79 | MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") |
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 88708a0c52a2..3913a3cc0ce6 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -144,6 +144,7 @@ static void __init perseus2_init_smc91x(void) | |||
144 | 144 | ||
145 | void omap_perseus2_init_irq(void) | 145 | void omap_perseus2_init_irq(void) |
146 | { | 146 | { |
147 | omap1_init_common_hw(); | ||
147 | omap_init_irq(); | 148 | omap_init_irq(); |
148 | omap_gpio_init(); | 149 | omap_gpio_init(); |
149 | perseus2_init_smc91x(); | 150 | perseus2_init_smc91x(); |
@@ -160,7 +161,7 @@ static struct map_desc omap_perseus2_io_desc[] __initdata = { | |||
160 | 161 | ||
161 | static void __init omap_perseus2_map_io(void) | 162 | static void __init omap_perseus2_map_io(void) |
162 | { | 163 | { |
163 | omap_map_common_io(); | 164 | omap1_map_common_io(); |
164 | iotable_init(omap_perseus2_io_desc, | 165 | iotable_init(omap_perseus2_io_desc, |
165 | ARRAY_SIZE(omap_perseus2_io_desc)); | 166 | ARRAY_SIZE(omap_perseus2_io_desc)); |
166 | 167 | ||
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 959b4b847c87..bfd5fdd1a875 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -162,6 +162,7 @@ static struct omap_board_config_kernel voiceblue_config[] = { | |||
162 | 162 | ||
163 | static void __init voiceblue_init_irq(void) | 163 | static void __init voiceblue_init_irq(void) |
164 | { | 164 | { |
165 | omap1_init_common_hw(); | ||
165 | omap_init_irq(); | 166 | omap_init_irq(); |
166 | omap_gpio_init(); | 167 | omap_gpio_init(); |
167 | } | 168 | } |
@@ -206,7 +207,7 @@ static void __init voiceblue_init(void) | |||
206 | 207 | ||
207 | static void __init voiceblue_map_io(void) | 208 | static void __init voiceblue_map_io(void) |
208 | { | 209 | { |
209 | omap_map_common_io(); | 210 | omap1_map_common_io(); |
210 | } | 211 | } |
211 | 212 | ||
212 | #define MACHINE_PANICED 1 | 213 | #define MACHINE_PANICED 1 |