ARM: tegra3: convert to CONFIG_MULTI_IRQ_HANDLER

Convert the tegra3 platforms and the tegra2 platforms that are
not upstream to be using the gic_handle_irq function as their
primary interrupt handler.

Change-Id: I5afb510058a1f758f6faf57ea5040bfcf2777993
Signed-off-by: Scott Williams <scwilliams@nvidia.com>

6 files changed, 17 insertions, 5 deletions

diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c
index c7de66284333..c27be09faa30 100644
--- a/arch/arm/mach-tegra/board-aruba.c
+++ b/arch/arm/mach-tegra/board-aruba.c
@@ -34,6 +34,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/platform_data/tegra_usb.h>
+
 #include <mach/clk.h>
 #include <mach/iomap.h>
 #include <mach/irqs.h>
@@ -43,10 +44,13 @@
 #include <mach/i2s.h>
 #include <mach/audio.h>
 #include <mach/tegra_das.h>
+
+#include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/usb_phy.h>
 #include <mach/nand.h>
+
 #include "board.h"
 #include "clock.h"
 #include "board-aruba.h"
@@ -540,6 +544,7 @@ MACHINE_START(ARUBA, "aruba")
 	.reserve        = tegra_aruba_reserve,
 	.init_early	= tegra_init_early,
 	.init_irq       = tegra_init_irq,
+	.handle_irq	= gic_handle_irq,
 	.timer          = &tegra_timer,
 	.init_machine   = tegra_aruba_init,
 MACHINE_END
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index 2dde2c38e5ea..c13c174caff1 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -55,13 +55,15 @@
 #include <mach/i2s.h>
 #include <mach/tegra_asoc_pdata.h>
 #include <mach/tegra_wm8903_pdata.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
 #include <mach/usb_phy.h>
 #include <mach/thermal.h>
 #include <mach/pci.h>
 #include <mach/gpio-tegra.h>
 
+#include <asm/hardware/gic.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
 #include "board.h"
 #include "clock.h"
 #include "board-cardhu.h"
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index ea3328ae2455..789786fd68e1 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -37,8 +37,8 @@
 #include <linux/fsl_devices.h>
 #include <linux/i2c/atmel_mxt_ts.h>
 #include <linux/memblock.h>
-
 #include <linux/nfc/pn544.h>
+
 #include <sound/max98088.h>
 
 #include <asm/hardware/gic.h>
@@ -49,8 +49,6 @@
 #include <mach/pinmux.h>
 #include <mach/iomap.h>
 #include <mach/io.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
 #include <mach/usb_phy.h>
 #include <mach/i2s.h>
 #include <mach/tegra_asoc_pdata.h>
@@ -58,6 +56,10 @@
 #include <mach/tegra-bb-power.h>
 #include <mach/gpio-tegra.h>
 
+#include <asm/mach-types.h>
+#include <asm/hardware/gic.h>
+#include <asm/mach/arch.h>
+
 #include "board.h"
 #include "clock.h"
 #include "board-enterprise.h"
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c
index 11b6cf4e3bb2..414ce5dd200c 100644
--- a/arch/arm/mach-tegra/board-whistler.c
+++ b/arch/arm/mach-tegra/board-whistler.c
@@ -51,6 +51,7 @@
 
 #include <sound/tlv320aic326x.h>
 
+#include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>
diff --git a/arch/arm/mach-tegra/p852/board-p852.c b/arch/arm/mach-tegra/p852/board-p852.c
index ffdf5d3e4bae..37eb0e862593 100644
--- a/arch/arm/mach-tegra/p852/board-p852.c
+++ b/arch/arm/mach-tegra/p852/board-p852.c
@@ -805,6 +805,7 @@ MACHINE_START(P852, "Tegra P852")
 	.reserve	= tegra_p852_reserve,
 	.init_early	= tegra_init_early,
 	.init_irq	= tegra_init_irq,
+	.handle_irq	= gic_handle_irq,
 	.timer		= &tegra_timer,
 	.init_machine	= tegra_p852_init,
 MACHINE_END
diff --git a/arch/arm/mach-tegra/p852/board-p852.h b/arch/arm/mach-tegra/p852/board-p852.h
index 8e8f1444029c..b8c8ce2f9509 100644
--- a/arch/arm/mach-tegra/p852/board-p852.h
+++ b/arch/arm/mach-tegra/p852/board-p852.h
@@ -34,6 +34,7 @@
 #include <linux/platform_data/tegra_nor.h>
 #include <linux/gpio.h>
 
+#include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>