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

Commit f314f33b authored by Rob Herring's avatar Rob Herring Committed by Russell King
Browse files

ARM: 7342/2: sa1100: prepare for sparse irq conversion 



In preparation to convert SA1100 to sparse irq, set .nr_irqs for each machine
and explicitly include mach/irqs.h as needed.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3638dd2b

arch/arm/mach-sa1100/assabet.c

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


#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/setup.h>

#include <asm/page.h>

#include <asm/pgtable-hwdef.h>
@@ -39,6 +38,7 @@ 
#include <asm/mach/serial_sa1100.h>

#include <mach/assabet.h>

#include <mach/mcp.h>

#include <mach/irqs.h>



#include "generic.h"
@@ -534,6 +534,7 @@ MACHINE_START(ASSABET, "Intel-Assabet") 
	.atag_offset	= 0x100,

	.fixup		= fixup_assabet,

	.map_io		= assabet_map_io,

	.nr_irqs	= SA1100_NR_IRQS,

	.init_irq	= sa1100_init_irq,

	.timer		= &sa1100_timer,

	.init_machine	= assabet_init,

arch/arm/mach-sa1100/badge4.c

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static void __init badge4_map_io(void) 
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")

	.atag_offset	= 0x100,

	.map_io		= badge4_map_io,

	.nr_irqs	= SA1100_NR_IRQS,

	.init_irq	= sa1100_init_irq,

	.timer		= &sa1100_timer,

#ifdef CONFIG_SA1111

arch/arm/mach-sa1100/cerf.c

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>



#include <asm/irq.h>

#include <mach/hardware.h>

#include <asm/setup.h>
@@ -30,6 +29,7 @@ 


#include <mach/cerf.h>

#include <mach/mcp.h>

#include <mach/irqs.h>

#include "generic.h"



static struct resource cerfuart2_resources[] = {
@@ -130,6 +130,7 @@ static void __init cerf_init(void) 
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")

	/* Maintainer: support@intrinsyc.com */

	.map_io		= cerf_map_io,

	.nr_irqs	= SA1100_NR_IRQS,

	.init_irq	= cerf_init_irq,

	.timer		= &sa1100_timer,

	.init_machine	= cerf_init,

arch/arm/mach-sa1100/collie.c

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


#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/page.h>

#include <asm/setup.h>

#include <mach/collie.h>
@@ -47,6 +46,7 @@ 
#include <asm/mach/sharpsl_param.h>

#include <asm/hardware/locomo.h>

#include <mach/mcp.h>

#include <mach/irqs.h>



#include "generic.h"
@@ -393,6 +393,7 @@ static void __init collie_map_io(void) 


MACHINE_START(COLLIE, "Sharp-Collie")

	.map_io		= collie_map_io,

	.nr_irqs	= SA1100_NR_IRQS,

	.init_irq	= sa1100_init_irq,

	.timer		= &sa1100_timer,

	.init_machine	= collie_init,

arch/arm/mach-sa1100/generic.c

+3 −1
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ 
#include <video/sa1100fb.h>



#include <asm/div64.h>

#include <mach/hardware.h>

#include <asm/system.h>

#include <asm/mach/map.h>

#include <asm/mach/flash.h>

#include <asm/irq.h>



#include <mach/hardware.h>

#include <mach/irqs.h>



#include "generic.h"



unsigned int reset_status;