From 7e01799c669c60460dce43556065ca3b66760dcf Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Tue, 6 Sep 2011 10:23:45 +0100 Subject: ARM: highbank: convert to CONFIG_MULTI_IRQ_HANDLER Convert the highbank platform to be using the gic_handle_irq function as its primary interrupt handler. Cc: Rob Herring Signed-off-by: Marc Zyngier --- arch/arm/mach-highbank/highbank.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-highbank/highbank.c') diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index b82dcf08e747..89bdf0039f7b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -140,6 +140,7 @@ DT_MACHINE_START(HIGHBANK, "Highbank") .map_io = highbank_map_io, .init_irq = highbank_init_irq, .timer = &highbank_timer, + .handle_irq = gic_handle_irq, .init_machine = highbank_init, .dt_compat = highbank_match, MACHINE_END -- cgit v1.2.2 From 00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 11:16:05 +0000 Subject: ARM: restart: highbank: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Rob Herring Signed-off-by: Russell King --- arch/arm/mach-highbank/highbank.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-highbank/highbank.c') diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 88660d500f5b..4508384f100f 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -146,4 +146,5 @@ DT_MACHINE_START(HIGHBANK, "Highbank") .timer = &highbank_timer, .init_machine = highbank_init, .dt_compat = highbank_match, + .restart = highbank_restart, MACHINE_END -- cgit v1.2.2