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

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

ARM: netx: convert to MULTI_IRQ_HANDLER 



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

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
parent 9a6879bd

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ config ARCH_NETX 
	select CPU_ARM926T

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	help

	  This enables support for systems based on the Hilscher NetX Soc

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

+0 −13
Original line number Diff line number Diff line
@@ -18,22 +18,9 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#include <mach/hardware.h>



		.macro  disable_fiq

		.endm



		.macro  get_irqnr_preamble, base, tmp

		ldr	\base, =io_p2v(0x001ff000)

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm
 


		.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp

		ldr	\irqstat, [\base, #0]

		clz	\irqnr, \irqstat

		rsb     \irqnr, \irqnr, #31

		cmp	\irqstat, #0

		.endm

arch/arm/mach-netx/nxdb500.c

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

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/vic.h>

#include <mach/netx-regs.h>

#include <mach/eth.h>
@@ -203,6 +204,7 @@ MACHINE_START(NXDB500, "Hilscher nxdb500") 
	.atag_offset	= 0x100,

	.map_io		= netx_map_io,

	.init_irq	= netx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &netx_timer,

	.init_machine	= nxdb500_init,

MACHINE_END

arch/arm/mach-netx/nxdkn.c

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

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/vic.h>

#include <mach/netx-regs.h>

#include <mach/eth.h>
@@ -96,6 +97,7 @@ MACHINE_START(NXDKN, "Hilscher nxdkn") 
	.atag_offset	= 0x100,

	.map_io		= netx_map_io,

	.init_irq	= netx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &netx_timer,

	.init_machine	= nxdkn_init,

MACHINE_END

arch/arm/mach-netx/nxeb500hmi.c

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

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/vic.h>

#include <mach/netx-regs.h>

#include <mach/eth.h>
@@ -180,6 +181,7 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi") 
	.atag_offset	= 0x100,

	.map_io		= netx_map_io,

	.init_irq	= netx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &netx_timer,

	.init_machine	= nxeb500hmi_init,

MACHINE_END