diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 10:48:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-29 19:49:28 -0400 |
commit | b9f71aad7cdb826246d4d6e5bd7ff99ffc4f3278 (patch) | |
tree | 4e95a25e2a7367c17eea308e74386deef36ef0dd /arch | |
parent | f5a5f430d9ae1c118b16d0ae9c74109eb622f7df (diff) |
ARM: l2c: imx vf610: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead. Since the .init_irq method only calls
irqchip_init(), we can remove that too as the generic code will take
care of that.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/mach-vf610.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c index 6288a9690e78..c44602758120 100644 --- a/arch/arm/mach-imx/mach-vf610.c +++ b/arch/arm/mach-imx/mach-vf610.c | |||
@@ -20,19 +20,14 @@ static void __init vf610_init_machine(void) | |||
20 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 20 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
21 | } | 21 | } |
22 | 22 | ||
23 | static void __init vf610_init_irq(void) | ||
24 | { | ||
25 | l2x0_of_init(0, ~0); | ||
26 | irqchip_init(); | ||
27 | } | ||
28 | |||
29 | static const char *vf610_dt_compat[] __initconst = { | 23 | static const char *vf610_dt_compat[] __initconst = { |
30 | "fsl,vf610", | 24 | "fsl,vf610", |
31 | NULL, | 25 | NULL, |
32 | }; | 26 | }; |
33 | 27 | ||
34 | DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF610 (Device Tree)") | 28 | DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF610 (Device Tree)") |
35 | .init_irq = vf610_init_irq, | 29 | .l2c_aux_val = 0, |
30 | .l2c_aux_mask = ~0, | ||
36 | .init_machine = vf610_init_machine, | 31 | .init_machine = vf610_init_machine, |
37 | .dt_compat = vf610_dt_compat, | 32 | .dt_compat = vf610_dt_compat, |
38 | .restart = mxc_restart, | 33 | .restart = mxc_restart, |