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

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

ARM: versatile: convert to MULTI_IRQ_HANDLER 



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

Cc: Russell King <linux@arm.linux.org.uk>
Tested-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
parent b7378eaf

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ config ARCH_VERSATILE 
	select PLAT_VERSATILE_CLCD

	select PLAT_VERSATILE_FPGA_IRQ

	select ARM_TIMER_SP804

	select MULTI_IRQ_HANDLER

	help

	  This enables support for ARM Ltd Versatile board.

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

+0 −30
Original line number Diff line number Diff line
@@ -7,39 +7,9 @@ 
 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/hardware/vic.h>



		.macro	disable_fiq

		.endm



		.macro  get_irqnr_preamble, base, tmp

		ldr	\base, =IO_ADDRESS(VERSATILE_VIC_BASE)

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm
 


		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

		ldr	\irqstat, [\base, #VIC_IRQ_STATUS]	@ get masked status

		mov	\irqnr, #0

		teq	\irqstat, #0

		beq	1003f



1001:		tst	\irqstat, #15

		bne	1002f

		add	\irqnr, \irqnr, #4

		movs	\irqstat, \irqstat, lsr #4

		bne	1001b

1002:		tst	\irqstat, #1

		bne	1003f

		add	\irqnr, \irqnr, #1

		movs	\irqstat, \irqstat, lsr #1

		bne	1002b

1003:		/* EQ will be set if no irqs pending */



@		clz	\irqnr, \irqstat

@1003:		/* EQ will be set if we reach MAXIRQNUM */

		.endm

arch/arm/mach-versatile/versatile_ab.c

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


#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/hardware/vic.h>

#include <asm/mach-types.h>



#include <asm/mach/arch.h>
@@ -39,6 +40,7 @@ MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") 
	.map_io		= versatile_map_io,

	.init_early	= versatile_init_early,

	.init_irq	= versatile_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &versatile_timer,

	.init_machine	= versatile_init,

MACHINE_END

arch/arm/mach-versatile/versatile_dt.c

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

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/hardware/vic.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -45,6 +46,7 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)") 
	.map_io		= versatile_map_io,

	.init_early	= versatile_init_early,

	.init_irq	= versatile_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &versatile_timer,

	.init_machine	= versatile_dt_init,

	.dt_compat	= versatile_dt_match,

arch/arm/mach-versatile/versatile_pb.c

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



#include <mach/hardware.h>

#include <asm/hardware/vic.h>

#include <asm/irq.h>

#include <asm/mach-types.h>
@@ -107,6 +108,7 @@ MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") 
	.map_io		= versatile_map_io,

	.init_early	= versatile_init_early,

	.init_irq	= versatile_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &versatile_timer,

	.init_machine	= versatile_pb_init,

MACHINE_END