Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 11 deletions
arch/arm/mach-sa1100/assabet.c
View file @ f314f33b
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable-hwdef.h> #include <asm/pgtable-hwdef.h>
...@@ -39,6 +38,7 @@ ...@@ -39,6 +38,7 @@
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/assabet.h> #include <mach/assabet.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -534,6 +534,7 @@ MACHINE_START(ASSABET, "Intel-Assabet") ...@@ -534,6 +534,7 @@ MACHINE_START(ASSABET, "Intel-Assabet")
.atag_offset = 0x100, .atag_offset = 0x100,
.fixup = fixup_assabet, .fixup = fixup_assabet,
.map_io = assabet_map_io, .map_io = assabet_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = assabet_init, .init_machine = assabet_init,
......
arch/arm/mach-sa1100/badge4.c
View file @ f314f33b
...@@ -304,6 +304,7 @@ static void __init badge4_map_io(void) ...@@ -304,6 +304,7 @@ static void __init badge4_map_io(void)
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = badge4_map_io, .map_io = badge4_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
#ifdef CONFIG_SA1111 #ifdef CONFIG_SA1111
......
arch/arm/mach-sa1100/cerf.c
View file @ f314f33b
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -30,6 +29,7 @@ ...@@ -30,6 +29,7 @@
#include <mach/cerf.h> #include <mach/cerf.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
static struct resource cerfuart2_resources[] = { static struct resource cerfuart2_resources[] = {
...@@ -130,6 +130,7 @@ static void __init cerf_init(void) ...@@ -130,6 +130,7 @@ static void __init cerf_init(void)
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
/* Maintainer: support@intrinsyc.com */ /* Maintainer: support@intrinsyc.com */
.map_io = cerf_map_io, .map_io = cerf_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = cerf_init_irq, .init_irq = cerf_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = cerf_init, .init_machine = cerf_init,
......
arch/arm/mach-sa1100/collie.c
View file @ f314f33b
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/collie.h> #include <mach/collie.h>
...@@ -47,6 +46,7 @@ ...@@ -47,6 +46,7 @@
#include <asm/mach/sharpsl_param.h> #include <asm/mach/sharpsl_param.h>
#include <asm/hardware/locomo.h> #include <asm/hardware/locomo.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -393,6 +393,7 @@ static void __init collie_map_io(void) ...@@ -393,6 +393,7 @@ static void __init collie_map_io(void)
MACHINE_START(COLLIE, "Sharp-Collie") MACHINE_START(COLLIE, "Sharp-Collie")
.map_io = collie_map_io, .map_io = collie_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = collie_init, .init_machine = collie_init,
......
arch/arm/mach-sa1100/generic.c
View file @ f314f33b
...@@ -23,12 +23,14 @@ ...@@ -23,12 +23,14 @@
#include <video/sa1100fb.h> #include <video/sa1100fb.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <mach/hardware.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
unsigned int reset_status; unsigned int reset_status;
......
arch/arm/mach-sa1100/h3100.c
View file @ f314f33b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <asm/mach/irda.h> #include <asm/mach/irda.h>
#include <mach/h3xxx.h> #include <mach/h3xxx.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -105,6 +106,7 @@ static void __init h3100_mach_init(void) ...@@ -105,6 +106,7 @@ static void __init h3100_mach_init(void)
MACHINE_START(H3100, "Compaq iPAQ H3100") MACHINE_START(H3100, "Compaq iPAQ H3100")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = h3100_map_io, .map_io = h3100_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = h3100_mach_init, .init_machine = h3100_mach_init,
......
arch/arm/mach-sa1100/h3600.c
View file @ f314f33b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <asm/mach/irda.h> #include <asm/mach/irda.h>
#include <mach/h3xxx.h> #include <mach/h3xxx.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -155,6 +156,7 @@ static void __init h3600_mach_init(void) ...@@ -155,6 +156,7 @@ static void __init h3600_mach_init(void)
MACHINE_START(H3600, "Compaq iPAQ H3600") MACHINE_START(H3600, "Compaq iPAQ H3600")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = h3600_map_io, .map_io = h3600_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = h3600_mach_init, .init_machine = h3600_mach_init,
......
arch/arm/mach-sa1100/hackkit.c
View file @ f314f33b
...@@ -22,12 +22,10 @@ ...@@ -22,12 +22,10 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
...@@ -35,6 +33,9 @@ ...@@ -35,6 +33,9 @@
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
/********************************************************************** /**********************************************************************
...@@ -194,6 +195,7 @@ static void __init hackkit_init(void) ...@@ -194,6 +195,7 @@ static void __init hackkit_init(void)
MACHINE_START(HACKKIT, "HackKit Cpu Board") MACHINE_START(HACKKIT, "HackKit Cpu Board")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = hackkit_map_io, .map_io = hackkit_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = hackkit_init, .init_machine = hackkit_init,
......
arch/arm/mach-sa1100/include/mach/irqs.h
View file @ f314f33b
...@@ -82,3 +82,5 @@ ...@@ -82,3 +82,5 @@
#else #else
#define NR_IRQS (IRQ_BOARD_START) #define NR_IRQS (IRQ_BOARD_START)
#endif #endif
#define SA1100_NR_IRQS NR_IRQS
arch/arm/mach-sa1100/irq.c
View file @ f314f33b
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include "generic.h" #include "generic.h"
......
arch/arm/mach-sa1100/jornada720.c
View file @ f314f33b
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <video/s1d13xxxfb.h> #include <video/s1d13xxxfb.h>
#include <mach/hardware.h>
#include <asm/hardware/sa1111.h> #include <asm/hardware/sa1111.h>
#include <asm/irq.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -34,6 +32,9 @@ ...@@ -34,6 +32,9 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
/* /*
...@@ -344,6 +345,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720") ...@@ -344,6 +345,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720")
/* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */ /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = jornada720_map_io, .map_io = jornada720_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = jornada720_mach_init, .init_machine = jornada720_mach_init,
......
arch/arm/mach-sa1100/lart.c
View file @ f314f33b
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -143,6 +144,7 @@ static void __init lart_map_io(void) ...@@ -143,6 +144,7 @@ static void __init lart_map_io(void)
MACHINE_START(LART, "LART") MACHINE_START(LART, "LART")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = lart_map_io, .map_io = lart_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.init_machine = lart_init, .init_machine = lart_init,
.timer = &sa1100_timer, .timer = &sa1100_timer,
......
arch/arm/mach-sa1100/nanoengine.c
View file @ f314f33b
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/nanoengine.h> #include <mach/nanoengine.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -107,6 +108,7 @@ static void __init nanoengine_init(void) ...@@ -107,6 +108,7 @@ static void __init nanoengine_init(void)
MACHINE_START(NANOENGINE, "BSE nanoEngine") MACHINE_START(NANOENGINE, "BSE nanoEngine")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = nanoengine_map_io, .map_io = nanoengine_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = nanoengine_init, .init_machine = nanoengine_init,
......
arch/arm/mach-sa1100/neponset.c
View file @ f314f33b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/assabet.h> #include <mach/assabet.h>
#include <mach/neponset.h> #include <mach/neponset.h>
#include <mach/irqs.h>
#define NEP_IRQ_SMC91X 0 #define NEP_IRQ_SMC91X 0
#define NEP_IRQ_USAR 1 #define NEP_IRQ_USAR 1
......
arch/arm/mach-sa1100/pleb.c
View file @ f314f33b
...@@ -131,6 +131,7 @@ static void __init pleb_map_io(void) ...@@ -131,6 +131,7 @@ static void __init pleb_map_io(void)
MACHINE_START(PLEB, "PLEB") MACHINE_START(PLEB, "PLEB")
.map_io = pleb_map_io, .map_io = pleb_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = pleb_init, .init_machine = pleb_init,
......
arch/arm/mach-sa1100/shannon.c
View file @ f314f33b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/shannon.h> #include <mach/shannon.h>
#include <mach/irqs.h>
#include "generic.h" #include "generic.h"
...@@ -99,6 +100,7 @@ static void __init shannon_map_io(void) ...@@ -99,6 +100,7 @@ static void __init shannon_map_io(void)
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = shannon_map_io, .map_io = shannon_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = shannon_init, .init_machine = shannon_init,
......
arch/arm/mach-sa1100/simpad.c
View file @ f314f33b
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -27,6 +26,7 @@ ...@@ -27,6 +26,7 @@
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
#include <mach/mcp.h> #include <mach/mcp.h>
#include <mach/simpad.h> #include <mach/simpad.h>
#include <mach/irqs.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -393,6 +393,7 @@ MACHINE_START(SIMPAD, "Simpad") ...@@ -393,6 +393,7 @@ MACHINE_START(SIMPAD, "Simpad")
/* Maintainer: Holger Freyther */ /* Maintainer: Holger Freyther */
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = simpad_map_io, .map_io = simpad_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq, .init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.restart = sa11x0_restart, .restart = sa11x0_restart,
......
arch/arm/mach-sa1100/ssp.c
View file @ f314f33b
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
#include <asm/hardware/ssp.h> #include <asm/hardware/ssp.h>
#define TIMEOUT 100000 #define TIMEOUT 100000
......
arch/arm/mach-sa1100/time.c
View file @ f314f33b
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/sched_clock.h> #include <asm/sched_clock.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
static u32 notrace sa1100_read_sched_clock(void) static u32 notrace sa1100_read_sched_clock(void)
{ {
......
drivers/gpio/gpio-sa1100.c
View file @ f314f33b
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
......
drivers/tty/serial/sa1100.c
View file @ f314f33b
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
/* We've been assigned a range on the "Low-density serial ports" major */ /* We've been assigned a range on the "Low-density serial ports" major */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7