Commit bbf5f385 authored by Marc Zyngier's avatar Marc Zyngier

ARM: ux500: convert to CONFIG_MULTI_IRQ_HANDLER

Convert the ux500 platforms to be using the gic_handle_irq
function as their primary interrupt handler.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent afed2a26
...@@ -7,6 +7,7 @@ config UX500_SOC_COMMON ...@@ -7,6 +7,7 @@ config UX500_SOC_COMMON
select HAS_MTU select HAS_MTU
select ARM_ERRATA_753970 select ARM_ERRATA_753970
select ARM_ERRATA_754322 select ARM_ERRATA_754322
select MULTI_IRQ_HANDLER
menu "Ux500 SoC" menu "Ux500 SoC"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/hardware/gic.h>
#include <plat/i2c.h> #include <plat/i2c.h>
#include <plat/ste_dma40.h> #include <plat/ste_dma40.h>
...@@ -695,6 +696,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") ...@@ -695,6 +696,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
.init_irq = ux500_init_irq, .init_irq = ux500_init_irq,
/* we re-use nomadik timer here */ /* we re-use nomadik timer here */
.timer = &ux500_timer, .timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = mop500_init_machine, .init_machine = mop500_init_machine,
MACHINE_END MACHINE_END
...@@ -703,6 +705,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") ...@@ -703,6 +705,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
.map_io = u8500_map_io, .map_io = u8500_map_io,
.init_irq = ux500_init_irq, .init_irq = ux500_init_irq,
.timer = &ux500_timer, .timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = hrefv60_init_machine, .init_machine = hrefv60_init_machine,
MACHINE_END MACHINE_END
...@@ -712,5 +715,6 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") ...@@ -712,5 +715,6 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
.init_irq = ux500_init_irq, .init_irq = ux500_init_irq,
/* we re-use nomadik timer here */ /* we re-use nomadik timer here */
.timer = &ux500_timer, .timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = snowball_init_machine, .init_machine = snowball_init_machine,
MACHINE_END MACHINE_END
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/mfd/ab5500/ab5500.h> #include <linux/mfd/ab5500/ab5500.h>
#include <asm/hardware/gic.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -149,5 +150,6 @@ MACHINE_START(U5500, "ST-Ericsson U5500 Platform") ...@@ -149,5 +150,6 @@ MACHINE_START(U5500, "ST-Ericsson U5500 Platform")
.map_io = u5500_map_io, .map_io = u5500_map_io,
.init_irq = ux500_init_irq, .init_irq = ux500_init_irq,
.timer = &ux500_timer, .timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = u5500_init_machine, .init_machine = u5500_init_machine,
MACHINE_END MACHINE_END
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <mach/hardware.h>
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment