diff options
author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
---|---|---|
committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
tree | a3689b801070c1360b120b7280c6adc4de5f692a /arch/arm/mach-omap2/omap4-common.c | |
parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
-rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 6897ae21bb82..708bb115a27f 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
@@ -15,13 +15,14 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/irqchip.h> | ||
18 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
19 | #include <linux/memblock.h> | 20 | #include <linux/memblock.h> |
20 | #include <linux/of_irq.h> | 21 | #include <linux/of_irq.h> |
21 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
22 | #include <linux/export.h> | 23 | #include <linux/export.h> |
24 | #include <linux/irqchip/arm-gic.h> | ||
23 | 25 | ||
24 | #include <asm/hardware/gic.h> | ||
25 | #include <asm/hardware/cache-l2x0.h> | 26 | #include <asm/hardware/cache-l2x0.h> |
26 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
27 | #include <asm/memblock.h> | 28 | #include <asm/memblock.h> |
@@ -225,7 +226,7 @@ static int __init omap_l2_cache_init(void) | |||
225 | 226 | ||
226 | return 0; | 227 | return 0; |
227 | } | 228 | } |
228 | early_initcall(omap_l2_cache_init); | 229 | omap_early_initcall(omap_l2_cache_init); |
229 | #endif | 230 | #endif |
230 | 231 | ||
231 | void __iomem *omap4_get_sar_ram_base(void) | 232 | void __iomem *omap4_get_sar_ram_base(void) |
@@ -253,18 +254,12 @@ static int __init omap4_sar_ram_init(void) | |||
253 | 254 | ||
254 | return 0; | 255 | return 0; |
255 | } | 256 | } |
256 | early_initcall(omap4_sar_ram_init); | 257 | omap_early_initcall(omap4_sar_ram_init); |
257 | |||
258 | static struct of_device_id irq_match[] __initdata = { | ||
259 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | ||
260 | { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, }, | ||
261 | { } | ||
262 | }; | ||
263 | 258 | ||
264 | void __init omap_gic_of_init(void) | 259 | void __init omap_gic_of_init(void) |
265 | { | 260 | { |
266 | omap_wakeupgen_init(); | 261 | omap_wakeupgen_init(); |
267 | of_irq_init(irq_match); | 262 | irqchip_init(); |
268 | } | 263 | } |
269 | 264 | ||
270 | #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) | 265 | #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) |