From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 21 Nov 2011 21:56:56 +0000 (+0000)
Subject: Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2832^2~2^2~36
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2d13ccaa8797d7e599f3792aed4b1e44b47f94a5;hp=-c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'irqchip-consolidation' of git://git./linux/kernel/git/maz/arm-platforms into devel-stable

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
---

2d13ccaa8797d7e599f3792aed4b1e44b47f94a5
diff --combined arch/arm/mach-omap2/board-2430sdp.c
index a17a6c49e18d,d33821b218b1..d88143faca59
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -34,7 -34,7 +34,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <plat/usb.h>
  #include <plat/gpmc-smc91x.h>
@@@ -301,6 -301,7 +301,7 @@@ MACHINE_START(OMAP_2430SDP, "OMAP2430 s
  	.map_io		= omap243x_map_io,
  	.init_early	= omap2430_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= omap_2430sdp_init,
  	.timer		= &omap2_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-3430sdp.c
index 670919c04851,1c17bd8d23aa..83126368ed99
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -33,7 -33,7 +33,7 @@@
  #include <plat/mcspi.h>
  #include <plat/board.h>
  #include <plat/usb.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
  #include <video/omapdss.h>
@@@ -728,6 -728,7 +728,7 @@@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3
  	.map_io		= omap3_map_io,
  	.init_early	= omap3430_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_3430sdp_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-3630sdp.c
index 63f4b4fefb46,b27aa85643bf..7969dd904bd3
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@@ -16,7 -16,7 +16,7 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/board.h>
  #include <plat/gpmc-smc91x.h>
  #include <plat/usb.h>
@@@ -215,6 -215,7 +215,7 @@@ MACHINE_START(OMAP_3630SDP, "OMAP 3630S
  	.map_io		= omap3_map_io,
  	.init_early	= omap3630_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_sdp_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-4430sdp.c
index cff2e3249fee,21e31d499745..ef2bbc09428a
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -27,12 -27,14 +27,13 @@@
  #include <linux/leds_pwm.h>
  
  #include <mach/hardware.h>
 -#include <mach/omap4-common.h>
+ #include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/usb.h>
  #include <plat/mmc.h>
  #include <plat/omap4-keypad.h>
@@@ -983,6 -985,7 +984,7 @@@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4
  	.map_io		= omap4_map_io,
  	.init_early	= omap4430_init_early,
  	.init_irq	= gic_init_irq,
+ 	.handle_irq	= gic_handle_irq,
  	.init_machine	= omap_4430sdp_init,
  	.timer		= &omap4_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-am3517crane.c
index 25704759d241,0166f4edc66c..7e90f93263db
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@@ -27,7 -27,7 +27,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/usb.h>
  
  #include "mux.h"
@@@ -98,6 -98,7 +98,7 @@@ MACHINE_START(CRANEBOARD, "AM3517/05 CR
  	.map_io		= omap3_map_io,
  	.init_early	= am35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= am3517_crane_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-am3517evm.c
index 56ea01184ec9,18cf2ceee51e..551cae8d9b8a
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -32,7 -32,7 +32,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/usb.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
@@@ -491,6 -491,7 +491,7 @@@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM
  	.map_io		= omap3_map_io,
  	.init_early	= am35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= am3517_evm_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-apollon.c
index 9aea158ba514,cf4f2c5cab70..5a66480feed0
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -37,7 -37,7 +37,7 @@@
  #include <plat/led.h>
  #include <plat/usb.h>
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  
  #include <video/omapdss.h>
@@@ -354,6 -354,7 +354,7 @@@ MACHINE_START(OMAP_APOLLON, "OMAP24xx A
  	.map_io		= omap242x_map_io,
  	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= omap_apollon_init,
  	.timer		= &omap2_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-cm-t35.c
index e1de33ebf95a,21a243684fd5..510b6a2ff0fa
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@@ -37,7 -37,7 +37,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/nand.h>
  #include <plat/gpmc.h>
  #include <plat/usb.h>
@@@ -634,6 -634,7 +634,7 @@@ MACHINE_START(CM_T35, "Compulab CM-T35"
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= cm_t35_init,
  	.timer		= &omap3_timer,
  MACHINE_END
@@@ -644,6 -645,7 +645,7 @@@ MACHINE_START(CM_T3730, "Compulab CM-T3
  	.map_io         = omap3_map_io,
  	.init_early     = omap3630_init_early,
  	.init_irq       = omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine   = cm_t3730_init,
  	.timer          = &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-cm-t3517.c
index 952df9b6c020,1e2c52bf8a13..efc5cedb1fbb
--- a/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@@ -39,7 -39,7 +39,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/usb.h>
  #include <plat/nand.h>
  #include <plat/gpmc.h>
@@@ -299,6 -299,7 +299,7 @@@ MACHINE_START(CM_T3517, "Compulab CM-T3
  	.map_io		= omap3_map_io,
  	.init_early	= am35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= cm_t3517_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-devkit8000.c
index 99e6e7a76d2e,631c84501054..d81ea7fa75ef
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@@ -41,7 -41,7 +41,7 @@@
  #include <asm/mach/flash.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <plat/nand.h>
  #include <plat/usb.h>
@@@ -660,6 -660,7 +660,7 @@@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= devkit8000_init,
  	.timer		= &omap3_secure_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-generic.c
index a89d72309de2,b9e71db33b92..63b54163b993
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -20,7 -20,8 +20,7 @@@
  #include <asm/mach/arch.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 -#include <mach/omap4-common.h>
 +#include "common.h"
  #include "common-board-devices.h"
  
  /*
@@@ -121,6 -122,7 +121,7 @@@ DT_MACHINE_START(OMAP243X_DT, "Generic 
  	.map_io		= omap243x_map_io,
  	.init_early	= omap2430_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= omap_generic_init,
  	.timer		= &omap2_timer,
  	.dt_compat	= omap243x_boards_compat,
diff --combined arch/arm/mach-omap2/board-h4.c
index 199a174e1ba8,8b4a4da6c49d..ec4018362e8e
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -34,7 -34,7 +34,7 @@@
  
  #include <plat/usb.h>
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/menelaus.h>
  #include <plat/dma.h>
  #include <plat/gpmc.h>
@@@ -396,6 -396,7 +396,7 @@@ MACHINE_START(OMAP_H4, "OMAP2420 H4 boa
  	.map_io		= omap242x_map_io,
  	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= omap_h4_init,
  	.timer		= &omap2_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-igep0020.c
index 6434bdcd7ade,b45d48decc67..5949f6ae3edf
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@@ -28,7 -28,7 +28,7 @@@
  #include <asm/mach/arch.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <plat/usb.h>
  #include <video/omapdss.h>
@@@ -672,6 -672,7 +672,7 @@@ MACHINE_START(IGEP0020, "IGEP v2 board"
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= igep_init,
  	.timer		= &omap3_timer,
  MACHINE_END
@@@ -682,6 -683,7 +683,7 @@@ MACHINE_START(IGEP0030, "IGEP OMAP3 mod
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= igep_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-ldp.c
index e75102a5eb0a,72b2d86cce42..13bde0e66934
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -36,7 -36,7 +36,7 @@@
  
  #include <plat/mcspi.h>
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <mach/board-zoom.h>
  
@@@ -434,6 -434,7 +434,7 @@@ MACHINE_START(OMAP_LDP, "OMAP LDP board
  	.map_io		= omap3_map_io,
  	.init_early	= omap3430_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_ldp_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-n8x0.c
index 736861463b34,fa040524c19a..bebd3d84365e
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -26,7 -26,7 +26,7 @@@
  #include <asm/mach-types.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/menelaus.h>
  #include <mach/irqs.h>
  #include <plat/mcspi.h>
@@@ -689,6 -689,7 +689,7 @@@ MACHINE_START(NOKIA_N800, "Nokia N800"
  	.map_io		= omap242x_map_io,
  	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= n8x0_init_machine,
  	.timer		= &omap2_timer,
  MACHINE_END
@@@ -699,6 -700,7 +700,7 @@@ MACHINE_START(NOKIA_N810, "Nokia N810"
  	.map_io		= omap242x_map_io,
  	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= n8x0_init_machine,
  	.timer		= &omap2_timer,
  MACHINE_END
@@@ -709,6 -711,7 +711,7 @@@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia 
  	.map_io		= omap242x_map_io,
  	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
+ 	.handle_irq	= omap2_intc_handle_irq,
  	.init_machine	= n8x0_init_machine,
  	.timer		= &omap2_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3beagle.c
index 1843e141f3a7,b77fd3b5fe7b..c34f56588284
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -40,7 -40,7 +40,7 @@@
  #include <asm/mach/flash.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <video/omapdss.h>
  #include <video/omap-panel-dvi.h>
  #include <plat/gpmc.h>
@@@ -559,6 -559,7 +559,7 @@@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beag
  	.map_io		= omap3_map_io,
  	.init_early	= omap3_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3_beagle_init,
  	.timer		= &omap3_secure_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3evm.c
index 1653d1813308,f86c1e8c303b..f11bc444e7be
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -43,7 -43,7 +43,7 @@@
  
  #include <plat/board.h>
  #include <plat/usb.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/mcspi.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-dvi.h>
@@@ -681,6 -681,7 +681,7 @@@ MACHINE_START(OMAP3EVM, "OMAP3 EVM"
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3_evm_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3logic.c
index 1b2a77621626,bd65196ff096..5fa6bad9574e
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@@ -40,7 -40,7 +40,7 @@@
  
  #include <plat/mux.h>
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc-smsc911x.h>
  #include <plat/gpmc.h>
  #include <plat/sdrc.h>
@@@ -208,6 -208,7 +208,7 @@@ MACHINE_START(OMAP3_TORPEDO, "Logic OMA
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3logic_init,
  	.timer		= &omap3_timer,
  MACHINE_END
@@@ -217,6 -218,7 +218,7 @@@ MACHINE_START(OMAP3530_LV_SOM, "OMAP Lo
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3logic_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3pandora.c
index 6297e814cddd,caf607ce593d..ef315c585b75
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -41,7 -41,7 +41,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <mach/hardware.h>
  #include <plat/mcspi.h>
  #include <plat/usb.h>
@@@ -606,6 -606,7 +606,7 @@@ MACHINE_START(OMAP3_PANDORA, "Pandora H
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3pandora_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3stalker.c
index ab226473deeb,4328ec889947..b21d70a2e4a7
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@@ -35,7 -35,7 +35,7 @@@
  #include <asm/mach/flash.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <plat/nand.h>
  #include <plat/usb.h>
@@@ -454,6 -454,7 +454,7 @@@ MACHINE_START(SBC3530, "OMAP3 STALKER"
  	.map_io			= omap3_map_io,
  	.init_early		= omap35xx_init_early,
  	.init_irq		= omap3_init_irq,
+ 	.handle_irq		= omap3_intc_handle_irq,
  	.init_machine		= omap3_stalker_init,
  	.timer			= &omap3_secure_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap3touchbook.c
index 2741a34630b1,2b7bc4e5a799..18cd340f9b7b
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@@ -44,7 -44,7 +44,7 @@@
  #include <asm/mach/flash.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/gpmc.h>
  #include <plat/nand.h>
  #include <plat/usb.h>
@@@ -381,6 -381,7 +381,7 @@@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbo
  	.map_io		= omap3_map_io,
  	.init_early	= omap3430_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap3_touchbook_init,
  	.timer		= &omap3_secure_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-omap4panda.c
index 7722d4d97fb9,aa9465e79bfc..b6f114436dbc
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -30,13 -30,15 +30,14 @@@
  #include <linux/wl12xx.h>
  
  #include <mach/hardware.h>
 -#include <mach/omap4-common.h>
+ #include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <video/omapdss.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/usb.h>
  #include <plat/mmc.h>
  #include <video/omap-panel-dvi.h>
@@@ -576,6 -578,7 +577,7 @@@ MACHINE_START(OMAP4_PANDA, "OMAP4 Pand
  	.map_io		= omap4_map_io,
  	.init_early	= omap4430_init_early,
  	.init_irq	= gic_init_irq,
+ 	.handle_irq	= gic_handle_irq,
  	.init_machine	= omap4_panda_init,
  	.timer		= &omap4_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-overo.c
index 26c5cbb4f2bb,9865d8d3e521..60a61ea759bf
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -43,7 -43,7 +43,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <video/omapdss.h>
  #include <video/omap-panel-generic-dpi.h>
  #include <video/omap-panel-dvi.h>
@@@ -562,6 -562,7 +562,7 @@@ MACHINE_START(OVERO, "Gumstix Overo"
  	.map_io		= omap3_map_io,
  	.init_early	= omap35xx_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= overo_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-rm680.c
index 6ffb6405285e,e0f5fd5df1df..a79d49e3fe09
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@@ -25,7 -25,7 +25,7 @@@
  #include <plat/mmc.h>
  #include <plat/usb.h>
  #include <plat/gpmc.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/onenand.h>
  
  #include "mux.h"
@@@ -149,6 -149,7 +149,7 @@@ MACHINE_START(NOKIA_RM680, "Nokia RM-68
  	.map_io		= omap3_map_io,
  	.init_early	= omap3630_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= rm680_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-rx51.c
index 847731377af7,5e52af5810d9..4e3c0965edf3
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -25,7 -25,7 +25,7 @@@
  
  #include <plat/mcspi.h>
  #include <plat/board.h>
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
  #include <plat/usb.h>
@@@ -127,6 -127,7 +127,7 @@@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 
  	.map_io		= omap3_map_io,
  	.init_early	= omap3430_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= rx51_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/board-zoom.c
index bd58f9205175,011b2e30b097..70e5b54a2115
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@@ -21,7 -21,7 +21,7 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/board.h>
  #include <plat/usb.h>
  
@@@ -135,6 -135,7 +135,7 @@@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 b
  	.map_io		= omap3_map_io,
  	.init_early	= omap3430_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_zoom_init,
  	.timer		= &omap3_timer,
  MACHINE_END
@@@ -145,6 -146,7 +146,7 @@@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 b
  	.map_io		= omap3_map_io,
  	.init_early	= omap3630_init_early,
  	.init_irq	= omap3_init_irq,
+ 	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_zoom_init,
  	.timer		= &omap3_timer,
  MACHINE_END
diff --combined arch/arm/mach-omap2/common.h
index 950b39d76e94,000000000000..18c4d5d20faf
mode 100644,000000..100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@@ -1,185 -1,0 +1,183 @@@
 +/*
 + * Header for code common to all OMAP2+ machines.
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License as published by the
 + * Free Software Foundation; either version 2 of the License, or (at your
 + * option) any later version.
 + *
 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
 + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + *
 + * You should have received a copy of the  GNU General Public License along
 + * with this program; if not, write  to the Free Software Foundation, Inc.,
 + * 675 Mass Ave, Cambridge, MA 02139, USA.
 + */
 +
 +#ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
 +#define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
 +
 +#include <linux/delay.h>
 +#include <plat/common.h>
 +
 +#ifdef CONFIG_SOC_OMAP2420
 +extern void omap242x_map_common_io(void);
 +#else
 +static inline void omap242x_map_common_io(void)
 +{
 +}
 +#endif
 +
 +#ifdef CONFIG_SOC_OMAP2430
 +extern void omap243x_map_common_io(void);
 +#else
 +static inline void omap243x_map_common_io(void)
 +{
 +}
 +#endif
 +
 +#ifdef CONFIG_ARCH_OMAP3
 +extern void omap34xx_map_common_io(void);
 +#else
 +static inline void omap34xx_map_common_io(void)
 +{
 +}
 +#endif
 +
 +#ifdef CONFIG_SOC_OMAPTI816X
 +extern void omapti816x_map_common_io(void);
 +#else
 +static inline void omapti816x_map_common_io(void)
 +{
 +}
 +#endif
 +
 +#ifdef CONFIG_ARCH_OMAP4
 +extern void omap44xx_map_common_io(void);
 +#else
 +static inline void omap44xx_map_common_io(void)
 +{
 +}
 +#endif
 +
 +extern void omap2_init_common_infrastructure(void);
 +
 +extern struct sys_timer omap2_timer;
 +extern struct sys_timer omap3_timer;
 +extern struct sys_timer omap3_secure_timer;
 +extern struct sys_timer omap4_timer;
 +
 +void omap2420_init_early(void);
 +void omap2430_init_early(void);
 +void omap3430_init_early(void);
 +void omap35xx_init_early(void);
 +void omap3630_init_early(void);
 +void omap3_init_early(void);	/* Do not use this one */
 +void am35xx_init_early(void);
 +void ti816x_init_early(void);
 +void omap4430_init_early(void);
 +
 +/*
 + * IO bases for various OMAP processors
 + * Except the tap base, rest all the io bases
 + * listed are physical addresses.
 + */
 +struct omap_globals {
 +	u32		class;		/* OMAP class to detect */
 +	void __iomem	*tap;		/* Control module ID code */
 +	void __iomem	*sdrc;           /* SDRAM Controller */
 +	void __iomem	*sms;            /* SDRAM Memory Scheduler */
 +	void __iomem	*ctrl;           /* System Control Module */
 +	void __iomem	*ctrl_pad;	/* PAD Control Module */
 +	void __iomem	*prm;            /* Power and Reset Management */
 +	void __iomem	*cm;             /* Clock Management */
 +	void __iomem	*cm2;
 +};
 +
 +void omap2_set_globals_242x(void);
 +void omap2_set_globals_243x(void);
 +void omap2_set_globals_3xxx(void);
 +void omap2_set_globals_443x(void);
 +void omap2_set_globals_ti816x(void);
 +
 +/* These get called from omap2_set_globals_xxxx(), do not call these */
 +void omap2_set_globals_tap(struct omap_globals *);
 +void omap2_set_globals_sdrc(struct omap_globals *);
 +void omap2_set_globals_control(struct omap_globals *);
 +void omap2_set_globals_prcm(struct omap_globals *);
 +
 +void omap242x_map_io(void);
 +void omap243x_map_io(void);
 +void omap3_map_io(void);
 +void omap4_map_io(void);
 +
 +/**
 + * omap_test_timeout - busy-loop, testing a condition
 + * @cond: condition to test until it evaluates to true
 + * @timeout: maximum number of microseconds in the timeout
 + * @index: loop index (integer)
 + *
 + * Loop waiting for @cond to become true or until at least @timeout
 + * microseconds have passed.  To use, define some integer @index in the
 + * calling code.  After running, if @index == @timeout, then the loop has
 + * timed out.
 + */
 +#define omap_test_timeout(cond, timeout, index)			\
 +({								\
 +	for (index = 0; index < timeout; index++) {		\
 +		if (cond)					\
 +			break;					\
 +		udelay(1);					\
 +	}							\
 +})
 +
 +extern struct device *omap2_get_mpuss_device(void);
 +extern struct device *omap2_get_iva_device(void);
 +extern struct device *omap2_get_l3_device(void);
 +extern struct device *omap4_get_dsp_device(void);
 +
 +void omap2_init_irq(void);
 +void omap3_init_irq(void);
 +void ti816x_init_irq(void);
 +extern int omap_irq_pending(void);
 +void omap_intc_save_context(void);
 +void omap_intc_restore_context(void);
 +void omap3_intc_suspend(void);
 +void omap3_intc_prepare_idle(void);
 +void omap3_intc_resume_idle(void);
 +
 +/*
 + * wfi used in low power code. Directly opcode is used instead
 + * of instruction to avoid mulit-omap build break
 + */
 +#ifdef CONFIG_THUMB2_KERNEL
 +#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
 +#else
 +#define do_wfi()			\
 +		__asm__ __volatile__ (".word	0xe320f003" : : : "memory")
 +#endif
 +
 +#ifdef CONFIG_CACHE_L2X0
 +extern void __iomem *l2cache_base;
 +#endif
 +
- extern void __iomem *gic_dist_base_addr;
- 
 +extern void __init gic_init_irq(void);
 +extern void omap_smc1(u32 fn, u32 arg);
 +
 +#ifdef CONFIG_SMP
 +/* Needed for secondary core boot */
 +extern void omap_secondary_startup(void);
 +extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
 +extern void omap_auxcoreboot_addr(u32 cpu_addr);
 +extern u32 omap_read_auxcoreboot0(void);
 +#endif
 +
 +#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
diff --combined arch/arm/mach-omap2/io.c
index 33f090ce0226,547f83145e30..8907c4ac1767
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -35,7 -35,7 +35,7 @@@
  #include "clock3xxx.h"
  #include "clock44xx.h"
  
 -#include <plat/common.h>
 +#include "common.h"
  #include <plat/omap-pm.h>
  #include "voltage.h"
  #include "powerdomain.h"
@@@ -43,7 -43,7 +43,7 @@@
  #include "clockdomain.h"
  #include <plat/omap_hwmod.h>
  #include <plat/multi.h>
 -#include <plat/common.h>
 +#include "common.h"
  
  /*
   * The machine specific code may provide the extra mapping besides the
@@@ -316,9 -316,6 +316,6 @@@ static int _set_hwmod_postsetup_state(s
  	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
  }
  
- /* See irq.c, omap4-common.c and entry-macro.S */
- void __iomem *omap_irq_base;
- 
  static void __init omap_common_init_early(void)
  {
  	omap2_check_revision();
diff --combined arch/arm/mach-omap2/omap4-common.c
index f327d7472ca7,073f12a666a4..beecfdd56ea3
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@@ -22,18 -22,17 +22,18 @@@
  #include <plat/irqs.h>
  
  #include <mach/hardware.h>
 -#include <mach/omap4-common.h>
 +
 +#include "common.h"
  
  #ifdef CONFIG_CACHE_L2X0
  void __iomem *l2cache_base;
  #endif
  
- void __iomem *gic_dist_base_addr;
- 
- 
  void __init gic_init_irq(void)
  {
+ 	void __iomem *omap_irq_base;
+ 	void __iomem *gic_dist_base_addr;
+ 
  	/* Static mapping, never released */
  	gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
  	BUG_ON(!gic_dist_base_addr);
diff --combined arch/arm/plat-omap/include/plat/irqs.h
index d3a9fcd53c45,90b95dd2064e..ebda7382c65b
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@@ -436,10 -436,21 +436,6 @@@
  #define INTCPS_NR_MIR_REGS	3
  #define INTCPS_NR_IRQS		96
  
--#ifndef __ASSEMBLY__
- extern void __iomem *omap_irq_base;
 -void omap1_init_irq(void);
 -void omap2_init_irq(void);
 -void omap3_init_irq(void);
 -void ti816x_init_irq(void);
 -extern int omap_irq_pending(void);
 -void omap_intc_save_context(void);
 -void omap_intc_restore_context(void);
 -void omap3_intc_suspend(void);
 -void omap3_intc_prepare_idle(void);
 -void omap3_intc_resume_idle(void);
 -void omap2_intc_handle_irq(struct pt_regs *regs);
 -void omap3_intc_handle_irq(struct pt_regs *regs);
--#endif
--
  #include <mach/hardware.h>
  
  #ifdef CONFIG_FIQ