Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf5f385 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config UX500_SOC_COMMON 
	select HAS_MTU

	select ARM_ERRATA_753970

	select ARM_ERRATA_754322

	select MULTI_IRQ_HANDLER



menu "Ux500 SoC"

arch/arm/mach-ux500/board-mop500.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/leds.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>



#include <plat/i2c.h>

#include <plat/ste_dma40.h>
@@ -695,6 +696,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") 
	.init_irq	= ux500_init_irq,

	/* we re-use nomadik timer here */

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= mop500_init_machine,

MACHINE_END
@@ -703,6 +705,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") 
	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= hrefv60_init_machine,

MACHINE_END
@@ -712,5 +715,6 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") 
	.init_irq	= ux500_init_irq,

	/* we re-use nomadik timer here */

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= snowball_init_machine,

MACHINE_END

arch/arm/mach-ux500/board-u5500.c

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/i2c.h>

#include <linux/mfd/ab5500/ab5500.h>



#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>
@@ -149,5 +150,6 @@ MACHINE_START(U5500, "ST-Ericsson U5500 Platform") 
	.map_io		= u5500_map_io,

	.init_irq	= ux500_init_irq,

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= u5500_init_machine,

MACHINE_END

arch/arm/mach-ux500/include/mach/entry-macro.S

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

#include <mach/hardware.h>

#include <asm/hardware/entry-macro-gic.S>



		.macro	disable_fiq

		.endm