diff options
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-prima2/common.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1340.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear6xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 17 | ||||
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.h | 20 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-virt/virt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 2 |
16 files changed, 2 insertions, 63 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index e7df2dd43a40..dc5d6becd8c7 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -176,7 +176,6 @@ static const char *highbank_match[] __initconst = { | |||
176 | 176 | ||
177 | DT_MACHINE_START(HIGHBANK, "Highbank") | 177 | DT_MACHINE_START(HIGHBANK, "Highbank") |
178 | .smp = smp_ops(highbank_smp_ops), | 178 | .smp = smp_ops(highbank_smp_ops), |
179 | .map_io = debug_ll_io_init, | ||
180 | .init_irq = highbank_init_irq, | 179 | .init_irq = highbank_init_irq, |
181 | .init_time = highbank_timer_init, | 180 | .init_time = highbank_timer_init, |
182 | .init_machine = highbank_init, | 181 | .init_machine = highbank_init, |
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 5b62b6489d4b..d67ecc1c8847 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
@@ -434,7 +434,6 @@ static const char *mxs_dt_compat[] __initdata = { | |||
434 | }; | 434 | }; |
435 | 435 | ||
436 | DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") | 436 | DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") |
437 | .map_io = debug_ll_io_init, | ||
438 | .init_irq = irqchip_init, | 437 | .init_irq = irqchip_init, |
439 | .handle_irq = icoll_handle_irq, | 438 | .handle_irq = icoll_handle_irq, |
440 | .init_time = mxs_timer_init, | 439 | .init_time = mxs_timer_init, |
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 59f6ff5c9bae..46cce9baa129 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
28 | #include <linux/irqchip.h> | ||
29 | #include <linux/platform_data/clk-nomadik.h> | 28 | #include <linux/platform_data/clk-nomadik.h> |
30 | #include <linux/platform_data/pinctrl-nomadik.h> | 29 | #include <linux/platform_data/pinctrl-nomadik.h> |
31 | #include <linux/pinctrl/machine.h> | 30 | #include <linux/pinctrl/machine.h> |
@@ -323,7 +322,6 @@ static const char * cpu8815_board_compat[] = { | |||
323 | 322 | ||
324 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") | 323 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") |
325 | .map_io = cpu8815_map_io, | 324 | .map_io = cpu8815_map_io, |
326 | .init_irq = irqchip_init, | ||
327 | .init_time = cpu8815_timer_init_of, | 325 | .init_time = cpu8815_timer_init_of, |
328 | .init_machine = cpu8815_init_of, | 326 | .init_machine = cpu8815_init_of, |
329 | .restart = cpu8815_restart, | 327 | .restart = cpu8815_restart, |
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index 4f94cd87972a..a9f475cdf603 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/clocksource.h> | 9 | #include <linux/clocksource.h> |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/irqchip.h> | ||
13 | #include <asm/sizes.h> | 12 | #include <asm/sizes.h> |
14 | #include <asm/mach-types.h> | 13 | #include <asm/mach-types.h> |
15 | #include <asm/mach/arch.h> | 14 | #include <asm/mach/arch.h> |
@@ -55,7 +54,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") | |||
55 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 54 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
56 | .nr_irqs = 128, | 55 | .nr_irqs = 128, |
57 | .map_io = sirfsoc_map_io, | 56 | .map_io = sirfsoc_map_io, |
58 | .init_irq = irqchip_init, | ||
59 | .init_time = sirfsoc_init_time, | 57 | .init_time = sirfsoc_init_time, |
60 | .init_machine = sirfsoc_mach_init, | 58 | .init_machine = sirfsoc_mach_init, |
61 | .init_late = sirfsoc_init_late, | 59 | .init_late = sirfsoc_init_late, |
@@ -74,7 +72,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") | |||
74 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 72 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
75 | .nr_irqs = 128, | 73 | .nr_irqs = 128, |
76 | .map_io = sirfsoc_map_io, | 74 | .map_io = sirfsoc_map_io, |
77 | .init_irq = irqchip_init, | ||
78 | .init_time = sirfsoc_init_time, | 75 | .init_time = sirfsoc_init_time, |
79 | .dma_zone_size = SZ_256M, | 76 | .dma_zone_size = SZ_256M, |
80 | .init_machine = sirfsoc_mach_init, | 77 | .init_machine = sirfsoc_mach_init, |
@@ -94,7 +91,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") | |||
94 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 91 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
95 | .smp = smp_ops(sirfsoc_smp_ops), | 92 | .smp = smp_ops(sirfsoc_smp_ops), |
96 | .map_io = sirfsoc_map_io, | 93 | .map_io = sirfsoc_map_io, |
97 | .init_irq = irqchip_init, | ||
98 | .init_time = sirfsoc_init_time, | 94 | .init_time = sirfsoc_init_time, |
99 | .init_machine = sirfsoc_mach_init, | 95 | .init_machine = sirfsoc_mach_init, |
100 | .init_late = sirfsoc_init_late, | 96 | .init_late = sirfsoc_init_late, |
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c index 9eaac2c881ea..7ad003001ab7 100644 --- a/arch/arm/mach-spear/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #define pr_fmt(fmt) "SPEAr1310: " fmt | 14 | #define pr_fmt(fmt) "SPEAr1310: " fmt |
15 | 15 | ||
16 | #include <linux/amba/pl022.h> | 16 | #include <linux/amba/pl022.h> |
17 | #include <linux/irqchip.h> | ||
18 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
19 | #include <linux/pata_arasan_cf_data.h> | 18 | #include <linux/pata_arasan_cf_data.h> |
20 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
@@ -60,7 +59,6 @@ static void __init spear1310_map_io(void) | |||
60 | DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree") | 59 | DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree") |
61 | .smp = smp_ops(spear13xx_smp_ops), | 60 | .smp = smp_ops(spear13xx_smp_ops), |
62 | .map_io = spear1310_map_io, | 61 | .map_io = spear1310_map_io, |
63 | .init_irq = irqchip_init, | ||
64 | .init_time = spear13xx_timer_init, | 62 | .init_time = spear13xx_timer_init, |
65 | .init_machine = spear1310_dt_init, | 63 | .init_machine = spear1310_dt_init, |
66 | .restart = spear_restart, | 64 | .restart = spear_restart, |
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index a04a7fe76f71..3fb683424729 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/amba/serial.h> | 17 | #include <linux/amba/serial.h> |
18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
19 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
20 | #include <linux/irqchip.h> | ||
21 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
22 | #include "generic.h" | 21 | #include "generic.h" |
23 | #include <mach/spear.h> | 22 | #include <mach/spear.h> |
@@ -155,7 +154,6 @@ static const char * const spear1340_dt_board_compat[] = { | |||
155 | DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree") | 154 | DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree") |
156 | .smp = smp_ops(spear13xx_smp_ops), | 155 | .smp = smp_ops(spear13xx_smp_ops), |
157 | .map_io = spear13xx_map_io, | 156 | .map_io = spear13xx_map_io, |
158 | .init_irq = irqchip_init, | ||
159 | .init_time = spear13xx_timer_init, | 157 | .init_time = spear13xx_timer_init, |
160 | .init_machine = spear1340_dt_init, | 158 | .init_machine = spear1340_dt_init, |
161 | .restart = spear_restart, | 159 | .restart = spear_restart, |
diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c index bac56e845f7a..b52e48f342f4 100644 --- a/arch/arm/mach-spear/spear300.c +++ b/arch/arm/mach-spear/spear300.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #define pr_fmt(fmt) "SPEAr300: " fmt | 14 | #define pr_fmt(fmt) "SPEAr300: " fmt |
15 | 15 | ||
16 | #include <linux/amba/pl08x.h> | 16 | #include <linux/amba/pl08x.h> |
17 | #include <linux/irqchip.h> | ||
18 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
19 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
20 | #include "generic.h" | 19 | #include "generic.h" |
@@ -212,7 +211,6 @@ static void __init spear300_map_io(void) | |||
212 | 211 | ||
213 | DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree") | 212 | DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree") |
214 | .map_io = spear300_map_io, | 213 | .map_io = spear300_map_io, |
215 | .init_irq = irqchip_init, | ||
216 | .init_time = spear3xx_timer_init, | 214 | .init_time = spear3xx_timer_init, |
217 | .init_machine = spear300_dt_init, | 215 | .init_machine = spear300_dt_init, |
218 | .restart = spear_restart, | 216 | .restart = spear_restart, |
diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c index 6ffbc63d516d..ed2029db391f 100644 --- a/arch/arm/mach-spear/spear310.c +++ b/arch/arm/mach-spear/spear310.c | |||
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include <linux/amba/pl08x.h> | 16 | #include <linux/amba/pl08x.h> |
17 | #include <linux/amba/serial.h> | 17 | #include <linux/amba/serial.h> |
18 | #include <linux/irqchip.h> | ||
19 | #include <linux/of_platform.h> | 18 | #include <linux/of_platform.h> |
20 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
21 | #include "generic.h" | 20 | #include "generic.h" |
@@ -254,7 +253,6 @@ static void __init spear310_map_io(void) | |||
254 | 253 | ||
255 | DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree") | 254 | DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree") |
256 | .map_io = spear310_map_io, | 255 | .map_io = spear310_map_io, |
257 | .init_irq = irqchip_init, | ||
258 | .init_time = spear3xx_timer_init, | 256 | .init_time = spear3xx_timer_init, |
259 | .init_machine = spear310_dt_init, | 257 | .init_machine = spear310_dt_init, |
260 | .restart = spear_restart, | 258 | .restart = spear_restart, |
diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index 6eb3eec65f96..bf634b32a930 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/amba/pl022.h> | 16 | #include <linux/amba/pl022.h> |
17 | #include <linux/amba/pl08x.h> | 17 | #include <linux/amba/pl08x.h> |
18 | #include <linux/amba/serial.h> | 18 | #include <linux/amba/serial.h> |
19 | #include <linux/irqchip.h> | ||
20 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
21 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
22 | #include <asm/mach/map.h> | 21 | #include <asm/mach/map.h> |
@@ -269,7 +268,6 @@ static void __init spear320_map_io(void) | |||
269 | 268 | ||
270 | DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree") | 269 | DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree") |
271 | .map_io = spear320_map_io, | 270 | .map_io = spear320_map_io, |
272 | .init_irq = irqchip_init, | ||
273 | .init_time = spear3xx_timer_init, | 271 | .init_time = spear3xx_timer_init, |
274 | .init_machine = spear320_dt_init, | 272 | .init_machine = spear320_dt_init, |
275 | .restart = spear_restart, | 273 | .restart = spear_restart, |
diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index ec8eefbbdfad..8b0295a41226 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/amba/pl08x.h> | 16 | #include <linux/amba/pl08x.h> |
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
19 | #include <linux/irqchip.h> | ||
20 | #include <linux/of.h> | 19 | #include <linux/of.h> |
21 | #include <linux/of_address.h> | 20 | #include <linux/of_address.h> |
22 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
@@ -423,7 +422,6 @@ static const char *spear600_dt_board_compat[] = { | |||
423 | 422 | ||
424 | DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)") | 423 | DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)") |
425 | .map_io = spear6xx_map_io, | 424 | .map_io = spear6xx_map_io, |
426 | .init_irq = irqchip_init, | ||
427 | .init_time = spear6xx_timer_init, | 425 | .init_time = spear6xx_timer_init, |
428 | .init_machine = spear600_dt_init, | 426 | .init_machine = spear600_dt_init, |
429 | .restart = spear_restart, | 427 | .restart = spear_restart, |
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 706ce35396b8..d1b5bc537fbb 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | #include <asm/system_misc.h> | 27 | #include <asm/system_misc.h> |
28 | 28 | ||
29 | #include "sunxi.h" | ||
30 | |||
31 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 | 29 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 |
32 | #define SUN4I_WATCHDOG_CTRL_RESTART (1 << 0) | 30 | #define SUN4I_WATCHDOG_CTRL_RESTART (1 << 0) |
33 | #define SUN4I_WATCHDOG_MODE_REG 0x04 | 31 | #define SUN4I_WATCHDOG_MODE_REG 0x04 |
@@ -81,20 +79,6 @@ static void sunxi_setup_restart(void) | |||
81 | arm_pm_restart = of_id->data; | 79 | arm_pm_restart = of_id->data; |
82 | } | 80 | } |
83 | 81 | ||
84 | static struct map_desc sunxi_io_desc[] __initdata = { | ||
85 | { | ||
86 | .virtual = (unsigned long) SUNXI_REGS_VIRT_BASE, | ||
87 | .pfn = __phys_to_pfn(SUNXI_REGS_PHYS_BASE), | ||
88 | .length = SUNXI_REGS_SIZE, | ||
89 | .type = MT_DEVICE, | ||
90 | }, | ||
91 | }; | ||
92 | |||
93 | void __init sunxi_map_io(void) | ||
94 | { | ||
95 | iotable_init(sunxi_io_desc, ARRAY_SIZE(sunxi_io_desc)); | ||
96 | } | ||
97 | |||
98 | static void __init sunxi_timer_init(void) | 82 | static void __init sunxi_timer_init(void) |
99 | { | 83 | { |
100 | sunxi_init_clocks(); | 84 | sunxi_init_clocks(); |
@@ -116,7 +100,6 @@ static const char * const sunxi_board_dt_compat[] = { | |||
116 | 100 | ||
117 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") | 101 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") |
118 | .init_machine = sunxi_dt_init, | 102 | .init_machine = sunxi_dt_init, |
119 | .map_io = sunxi_map_io, | ||
120 | .init_irq = irqchip_init, | 103 | .init_irq = irqchip_init, |
121 | .init_time = sunxi_timer_init, | 104 | .init_time = sunxi_timer_init, |
122 | .dt_compat = sunxi_board_dt_compat, | 105 | .dt_compat = sunxi_board_dt_compat, |
diff --git a/arch/arm/mach-sunxi/sunxi.h b/arch/arm/mach-sunxi/sunxi.h deleted file mode 100644 index 33b58712adea..000000000000 --- a/arch/arm/mach-sunxi/sunxi.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* | ||
2 | * Generic definitions for Allwinner SunXi SoCs | ||
3 | * | ||
4 | * Copyright (C) 2012 Maxime Ripard | ||
5 | * | ||
6 | * Maxime Ripard <maxime.ripard@free-electrons.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public | ||
9 | * License version 2. This program is licensed "as is" without any | ||
10 | * warranty of any kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #ifndef __MACH_SUNXI_H | ||
14 | #define __MACH_SUNXI_H | ||
15 | |||
16 | #define SUNXI_REGS_PHYS_BASE 0x01c00000 | ||
17 | #define SUNXI_REGS_VIRT_BASE IOMEM(0xf1c00000) | ||
18 | #define SUNXI_REGS_SIZE (SZ_2M + SZ_1M) | ||
19 | |||
20 | #endif /* __MACH_SUNXI_H */ | ||
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 8802030df98d..d6016970e2fe 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/clocksource.h> | 9 | #include <linux/clocksource.h> |
10 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/irqchip.h> | ||
13 | #include <linux/of_address.h> | 12 | #include <linux/of_address.h> |
14 | #include <linux/of_fdt.h> | 13 | #include <linux/of_fdt.h> |
15 | #include <linux/of_irq.h> | 14 | #include <linux/of_irq.h> |
@@ -458,7 +457,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") | |||
458 | .smp = smp_ops(vexpress_smp_ops), | 457 | .smp = smp_ops(vexpress_smp_ops), |
459 | .map_io = v2m_dt_map_io, | 458 | .map_io = v2m_dt_map_io, |
460 | .init_early = v2m_dt_init_early, | 459 | .init_early = v2m_dt_init_early, |
461 | .init_irq = irqchip_init, | ||
462 | .init_time = v2m_dt_timer_init, | 460 | .init_time = v2m_dt_timer_init, |
463 | .init_machine = v2m_dt_init, | 461 | .init_machine = v2m_dt_init, |
464 | MACHINE_END | 462 | MACHINE_END |
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c index 061f283f579e..bdf05f41ca90 100644 --- a/arch/arm/mach-virt/virt.c +++ b/arch/arm/mach-virt/virt.c | |||
@@ -18,7 +18,6 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/irqchip.h> | ||
22 | #include <linux/of_irq.h> | 21 | #include <linux/of_irq.h> |
23 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
24 | #include <linux/smp.h> | 23 | #include <linux/smp.h> |
@@ -39,7 +38,6 @@ static const char *virt_dt_match[] = { | |||
39 | extern struct smp_operations virt_smp_ops; | 38 | extern struct smp_operations virt_smp_ops; |
40 | 39 | ||
41 | DT_MACHINE_START(VIRT, "Dummy Virtual Machine") | 40 | DT_MACHINE_START(VIRT, "Dummy Virtual Machine") |
42 | .init_irq = irqchip_init, | ||
43 | .init_machine = virt_init, | 41 | .init_machine = virt_init, |
44 | .smp = smp_ops(virt_smp_ops), | 42 | .smp = smp_ops(virt_smp_ops), |
45 | .dt_compat = virt_dt_match, | 43 | .dt_compat = virt_dt_match, |
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index f5c33df7a597..f8f2f00856e0 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | #include <linux/clocksource.h> | 21 | #include <linux/clocksource.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/irqchip.h> | ||
24 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
25 | 24 | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
@@ -179,7 +178,6 @@ static const char * const vt8500_dt_compat[] = { | |||
179 | DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") | 178 | DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") |
180 | .dt_compat = vt8500_dt_compat, | 179 | .dt_compat = vt8500_dt_compat, |
181 | .map_io = vt8500_map_io, | 180 | .map_io = vt8500_map_io, |
182 | .init_irq = irqchip_init, | ||
183 | .init_machine = vt8500_init, | 181 | .init_machine = vt8500_init, |
184 | .init_time = clocksource_of_init, | 182 | .init_time = clocksource_of_init, |
185 | .restart = vt8500_restart, | 183 | .restart = vt8500_restart, |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index e0d8565671a6..faa36d7b8786 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -1232,6 +1232,8 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
1232 | */ | 1232 | */ |
1233 | if (mdesc->map_io) | 1233 | if (mdesc->map_io) |
1234 | mdesc->map_io(); | 1234 | mdesc->map_io(); |
1235 | else | ||
1236 | debug_ll_io_init(); | ||
1235 | fill_pmd_gaps(); | 1237 | fill_pmd_gaps(); |
1236 | 1238 | ||
1237 | /* Reserve fixed i/o space in VMALLOC region */ | 1239 | /* Reserve fixed i/o space in VMALLOC region */ |