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

Commit 695436e3 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7349/1: integrator: convert to sparse irqs 



This converts the Integrator AP/CP to use sparse IRQs.
Tested on both machines.

Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ddecdfce

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ config ARCH_INTEGRATOR 
	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for ARM's Integrator platform.

arch/arm/mach-integrator/core.c

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 


#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/irq.h>

#include <mach/cm.h>

#include <mach/irqs.h>



#include <asm/system.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

arch/arm/mach-integrator/include/mach/irqs.h

+2 −1
Original line number Diff line number Diff line
@@ -78,5 +78,6 @@ 
#define IRQ_SIC_CP_LMINT7		46

#define IRQ_SIC_END			46



#define NR_IRQS                         47

#define NR_IRQS_INTEGRATOR_AP		34

#define NR_IRQS_INTEGRATOR_CP		47

arch/arm/mach-integrator/integrator_ap.c

+2 −1
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ 
#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/hardware/arm_timer.h>

#include <asm/irq.h>

#include <asm/setup.h>

#include <asm/param.h>		/* HZ */

#include <asm/mach-types.h>

#include <asm/sched_clock.h>



#include <mach/lm.h>

#include <mach/irqs.h>



#include <asm/mach/arch.h>

#include <asm/mach/irq.h>
@@ -475,6 +475,7 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator") 
	.atag_offset	= 0x100,

	.reserve	= integrator_reserve,

	.map_io		= ap_map_io,

	.nr_irqs	= NR_IRQS_INTEGRATOR_AP,

	.init_early	= integrator_init_early,

	.init_irq	= ap_init_irq,

	.timer		= &ap_timer,

arch/arm/mach-integrator/integrator_cp.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <mach/hardware.h>

#include <mach/platform.h>

#include <asm/irq.h>

#include <asm/setup.h>

#include <asm/mach-types.h>

#include <asm/hardware/arm_timer.h>
@@ -34,6 +33,7 @@ 


#include <mach/cm.h>

#include <mach/lm.h>

#include <mach/irqs.h>



#include <asm/mach/arch.h>

#include <asm/mach/irq.h>
@@ -495,6 +495,7 @@ MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") 
	.atag_offset	= 0x100,

	.reserve	= integrator_reserve,

	.map_io		= intcp_map_io,

	.nr_irqs	= NR_IRQS_INTEGRATOR_CP,

	.init_early	= intcp_init_early,

	.init_irq	= intcp_init_irq,

	.timer		= &cp_timer,