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

Commit 774b51f8 authored by Jamie Iles's avatar Jamie Iles Committed by Marc Zyngier
Browse files

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER 



Now that there is a generic IRQ handler for multiple VIC devices use it
for s3c64xx to help building multi platform kernels.

Cc: Ben Dooks <ben-linux@fluff.org>
Tested-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
parent 42ab5304

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ config ARCH_S3C64XX 
	select SAMSUNG_GPIOLIB_4BIT

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select MULTI_IRQ_HANDLER

	help

	  Samsung S3C64XX series based systems

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

+4 −3
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * warranty of any kind, whether express or implied.

*/



#include <mach/map.h>

#include <mach/irqs.h>

		.macro  disable_fiq

		.endm



#include <asm/entry-macro-vic2.S>
 
		.macro  arch_ret_to_user, tmp1, tmp2

		.endm

arch/arm/mach-s3c64xx/mach-anw6410.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include <video/platform_lcd.h>



#include <asm/hardware/vic.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>
@@ -236,6 +237,7 @@ MACHINE_START(ANW6410, "A&W6410") 
	.atag_offset	= 0x100,



	.init_irq	= s3c6410_init_irq,

	.handle_irq	= vic_handle_irq,

	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.timer		= &s3c24xx_timer,

arch/arm/mach-s3c64xx/mach-crag6410.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/mfd/wm831x/irq.h>

#include <linux/mfd/wm831x/gpio.h>



#include <asm/hardware/vic.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>
@@ -711,6 +712,7 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") 
	/* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */

	.atag_offset	= 0x100,

	.init_irq	= s3c6410_init_irq,

	.handle_irq	= vic_handle_irq,

	.map_io		= crag6410_map_io,

	.init_machine	= crag6410_machine_init,

	.timer		= &s3c24xx_timer,

arch/arm/mach-s3c64xx/mach-hmt.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <mach/hardware.h>

#include <mach/map.h>



#include <asm/hardware/vic.h>

#include <asm/irq.h>

#include <asm/mach-types.h>
@@ -267,6 +268,7 @@ MACHINE_START(HMT, "Airgoo-HMT") 
	/* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */

	.atag_offset	= 0x100,

	.init_irq	= s3c6410_init_irq,

	.handle_irq	= vic_handle_irq,

	.map_io		= hmt_map_io,

	.init_machine	= hmt_machine_init,

	.timer		= &s3c24xx_timer,