aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-02-23 18:06:51 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 18:57:20 -0400
commitf314f33be77d6a48ae19748e3dc4a6657042b525 (patch)
tree6943191f7d9052c51dd66c4cdb99e5a265d2d0de
parent3638dd2b45ceac2e9526f0ee83b0923db3546979 (diff)
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: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat
-rw-r--r--arch/arm/mach-sa1100/assabet.c3
-rw-r--r--arch/arm/mach-sa1100/badge4.c1
-rw-r--r--arch/arm/mach-sa1100/cerf.c3
-rw-r--r--arch/arm/mach-sa1100/collie.c3
-rw-r--r--arch/arm/mach-sa1100/generic.c4
-rw-r--r--arch/arm/mach-sa1100/h3100.c2
-rw-r--r--arch/arm/mach-sa1100/h3600.c2
-rw-r--r--arch/arm/mach-sa1100/hackkit.c6
-rw-r--r--arch/arm/mach-sa1100/include/mach/irqs.h2
-rw-r--r--arch/arm/mach-sa1100/irq.c1
-rw-r--r--arch/arm/mach-sa1100/jornada720.c6
-rw-r--r--arch/arm/mach-sa1100/lart.c2
-rw-r--r--arch/arm/mach-sa1100/nanoengine.c2
-rw-r--r--arch/arm/mach-sa1100/neponset.c1
-rw-r--r--arch/arm/mach-sa1100/pleb.c1
-rw-r--r--arch/arm/mach-sa1100/shannon.c2
-rw-r--r--arch/arm/mach-sa1100/simpad.c5
-rw-r--r--arch/arm/mach-sa1100/ssp.c2
-rw-r--r--arch/arm/mach-sa1100/time.c1
-rw-r--r--drivers/gpio/gpio-sa1100.c1
-rw-r--r--drivers/tty/serial/sa1100.c1
21 files changed, 40 insertions, 11 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index e708a93a7ddb..375d3f779a88 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -25,7 +25,6 @@
25 25
26#include <mach/hardware.h> 26#include <mach/hardware.h>
27#include <asm/mach-types.h> 27#include <asm/mach-types.h>
28#include <asm/irq.h>
29#include <asm/setup.h> 28#include <asm/setup.h>
30#include <asm/page.h> 29#include <asm/page.h>
31#include <asm/pgtable-hwdef.h> 30#include <asm/pgtable-hwdef.h>
@@ -39,6 +38,7 @@
39#include <asm/mach/serial_sa1100.h> 38#include <asm/mach/serial_sa1100.h>
40#include <mach/assabet.h> 39#include <mach/assabet.h>
41#include <mach/mcp.h> 40#include <mach/mcp.h>
41#include <mach/irqs.h>
42 42
43#include "generic.h" 43#include "generic.h"
44 44
@@ -534,6 +534,7 @@ MACHINE_START(ASSABET, "Intel-Assabet")
534 .atag_offset = 0x100, 534 .atag_offset = 0x100,
535 .fixup = fixup_assabet, 535 .fixup = fixup_assabet,
536 .map_io = assabet_map_io, 536 .map_io = assabet_map_io,
537 .nr_irqs = SA1100_NR_IRQS,
537 .init_irq = sa1100_init_irq, 538 .init_irq = sa1100_init_irq,
538 .timer = &sa1100_timer, 539 .timer = &sa1100_timer,
539 .init_machine = assabet_init, 540 .init_machine = assabet_init,
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 5839c9d8bb92..8c805425b684 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -304,6 +304,7 @@ static void __init badge4_map_io(void)
304MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") 304MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
305 .atag_offset = 0x100, 305 .atag_offset = 0x100,
306 .map_io = badge4_map_io, 306 .map_io = badge4_map_io,
307 .nr_irqs = SA1100_NR_IRQS,
307 .init_irq = sa1100_init_irq, 308 .init_irq = sa1100_init_irq,
308 .timer = &sa1100_timer, 309 .timer = &sa1100_timer,
309#ifdef CONFIG_SA1111 310#ifdef CONFIG_SA1111
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 8015604cfc22..4a61f60e0502 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -18,7 +18,6 @@
18#include <linux/mtd/mtd.h> 18#include <linux/mtd/mtd.h>
19#include <linux/mtd/partitions.h> 19#include <linux/mtd/partitions.h>
20 20
21#include <asm/irq.h>
22#include <mach/hardware.h> 21#include <mach/hardware.h>
23#include <asm/setup.h> 22#include <asm/setup.h>
24 23
@@ -30,6 +29,7 @@
30 29
31#include <mach/cerf.h> 30#include <mach/cerf.h>
32#include <mach/mcp.h> 31#include <mach/mcp.h>
32#include <mach/irqs.h>
33#include "generic.h" 33#include "generic.h"
34 34
35static struct resource cerfuart2_resources[] = { 35static struct resource cerfuart2_resources[] = {
@@ -130,6 +130,7 @@ static void __init cerf_init(void)
130MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") 130MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
131 /* Maintainer: support@intrinsyc.com */ 131 /* Maintainer: support@intrinsyc.com */
132 .map_io = cerf_map_io, 132 .map_io = cerf_map_io,
133 .nr_irqs = SA1100_NR_IRQS,
133 .init_irq = cerf_init_irq, 134 .init_irq = cerf_init_irq,
134 .timer = &sa1100_timer, 135 .timer = &sa1100_timer,
135 .init_machine = cerf_init, 136 .init_machine = cerf_init,
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index d4339d639475..48885b7efd6b 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -33,7 +33,6 @@
33 33
34#include <mach/hardware.h> 34#include <mach/hardware.h>
35#include <asm/mach-types.h> 35#include <asm/mach-types.h>
36#include <asm/irq.h>
37#include <asm/page.h> 36#include <asm/page.h>
38#include <asm/setup.h> 37#include <asm/setup.h>
39#include <mach/collie.h> 38#include <mach/collie.h>
@@ -47,6 +46,7 @@
47#include <asm/mach/sharpsl_param.h> 46#include <asm/mach/sharpsl_param.h>
48#include <asm/hardware/locomo.h> 47#include <asm/hardware/locomo.h>
49#include <mach/mcp.h> 48#include <mach/mcp.h>
49#include <mach/irqs.h>
50 50
51#include "generic.h" 51#include "generic.h"
52 52
@@ -393,6 +393,7 @@ static void __init collie_map_io(void)
393 393
394MACHINE_START(COLLIE, "Sharp-Collie") 394MACHINE_START(COLLIE, "Sharp-Collie")
395 .map_io = collie_map_io, 395 .map_io = collie_map_io,
396 .nr_irqs = SA1100_NR_IRQS,
396 .init_irq = sa1100_init_irq, 397 .init_irq = sa1100_init_irq,
397 .timer = &sa1100_timer, 398 .timer = &sa1100_timer,
398 .init_machine = collie_init, 399 .init_machine = collie_init,
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 97e9bdf7f297..b18470420d3e 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -23,12 +23,14 @@
23#include <video/sa1100fb.h> 23#include <video/sa1100fb.h>
24 24
25#include <asm/div64.h> 25#include <asm/div64.h>
26#include <mach/hardware.h>
27#include <asm/system.h> 26#include <asm/system.h>
28#include <asm/mach/map.h> 27#include <asm/mach/map.h>
29#include <asm/mach/flash.h> 28#include <asm/mach/flash.h>
30#include <asm/irq.h> 29#include <asm/irq.h>
31 30
31#include <mach/hardware.h>
32#include <mach/irqs.h>
33
32#include "generic.h" 34#include "generic.h"
33 35
34unsigned int reset_status; 36unsigned int reset_status;
diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c
index f23e7d0b2fba..b2e8d0f418e0 100644
--- a/arch/arm/mach-sa1100/h3100.c
+++ b/arch/arm/mach-sa1100/h3100.c
@@ -21,6 +21,7 @@
21#include <asm/mach/irda.h> 21#include <asm/mach/irda.h>
22 22
23#include <mach/h3xxx.h> 23#include <mach/h3xxx.h>
24#include <mach/irqs.h>
24 25
25#include "generic.h" 26#include "generic.h"
26 27
@@ -105,6 +106,7 @@ static void __init h3100_mach_init(void)
105MACHINE_START(H3100, "Compaq iPAQ H3100") 106MACHINE_START(H3100, "Compaq iPAQ H3100")
106 .atag_offset = 0x100, 107 .atag_offset = 0x100,
107 .map_io = h3100_map_io, 108 .map_io = h3100_map_io,
109 .nr_irqs = SA1100_NR_IRQS,
108 .init_irq = sa1100_init_irq, 110 .init_irq = sa1100_init_irq,
109 .timer = &sa1100_timer, 111 .timer = &sa1100_timer,
110 .init_machine = h3100_mach_init, 112 .init_machine = h3100_mach_init,
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 2feac56ec90d..cb6659f294fe 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -21,6 +21,7 @@
21#include <asm/mach/irda.h> 21#include <asm/mach/irda.h>
22 22
23#include <mach/h3xxx.h> 23#include <mach/h3xxx.h>
24#include <mach/irqs.h>
24 25
25#include "generic.h" 26#include "generic.h"
26 27
@@ -155,6 +156,7 @@ static void __init h3600_mach_init(void)
155MACHINE_START(H3600, "Compaq iPAQ H3600") 156MACHINE_START(H3600, "Compaq iPAQ H3600")
156 .atag_offset = 0x100, 157 .atag_offset = 0x100,
157 .map_io = h3600_map_io, 158 .map_io = h3600_map_io,
159 .nr_irqs = SA1100_NR_IRQS,
158 .init_irq = sa1100_init_irq, 160 .init_irq = sa1100_init_irq,
159 .timer = &sa1100_timer, 161 .timer = &sa1100_timer,
160 .init_machine = h3600_mach_init, 162 .init_machine = h3600_mach_init,
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index 37d381ad5464..5535475bf583 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -22,12 +22,10 @@
22#include <linux/mtd/mtd.h> 22#include <linux/mtd/mtd.h>
23#include <linux/mtd/partitions.h> 23#include <linux/mtd/partitions.h>
24 24
25#include <mach/hardware.h>
26#include <asm/mach-types.h> 25#include <asm/mach-types.h>
27#include <asm/setup.h> 26#include <asm/setup.h>
28#include <asm/page.h> 27#include <asm/page.h>
29#include <asm/pgtable.h> 28#include <asm/pgtable.h>
30#include <asm/irq.h>
31 29
32#include <asm/mach/arch.h> 30#include <asm/mach/arch.h>
33#include <asm/mach/flash.h> 31#include <asm/mach/flash.h>
@@ -35,6 +33,9 @@
35#include <asm/mach/irq.h> 33#include <asm/mach/irq.h>
36#include <asm/mach/serial_sa1100.h> 34#include <asm/mach/serial_sa1100.h>
37 35
36#include <mach/hardware.h>
37#include <mach/irqs.h>
38
38#include "generic.h" 39#include "generic.h"
39 40
40/********************************************************************** 41/**********************************************************************
@@ -194,6 +195,7 @@ static void __init hackkit_init(void)
194MACHINE_START(HACKKIT, "HackKit Cpu Board") 195MACHINE_START(HACKKIT, "HackKit Cpu Board")
195 .atag_offset = 0x100, 196 .atag_offset = 0x100,
196 .map_io = hackkit_map_io, 197 .map_io = hackkit_map_io,
198 .nr_irqs = SA1100_NR_IRQS,
197 .init_irq = sa1100_init_irq, 199 .init_irq = sa1100_init_irq,
198 .timer = &sa1100_timer, 200 .timer = &sa1100_timer,
199 .init_machine = hackkit_init, 201 .init_machine = hackkit_init,
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 9e07634a4670..0ad78218c9f3 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -82,3 +82,5 @@
82#else 82#else
83#define NR_IRQS (IRQ_BOARD_START) 83#define NR_IRQS (IRQ_BOARD_START)
84#endif 84#endif
85
86#define SA1100_NR_IRQS NR_IRQS
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index 5d12a305f53e..516ccc25d7fd 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -17,6 +17,7 @@
17#include <linux/syscore_ops.h> 17#include <linux/syscore_ops.h>
18 18
19#include <mach/hardware.h> 19#include <mach/hardware.h>
20#include <mach/irqs.h>
20#include <asm/mach/irq.h> 21#include <asm/mach/irq.h>
21 22
22#include "generic.h" 23#include "generic.h"
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 8be8130baf63..b7dcb1887aca 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -23,9 +23,7 @@
23#include <linux/mtd/partitions.h> 23#include <linux/mtd/partitions.h>
24#include <video/s1d13xxxfb.h> 24#include <video/s1d13xxxfb.h>
25 25
26#include <mach/hardware.h>
27#include <asm/hardware/sa1111.h> 26#include <asm/hardware/sa1111.h>
28#include <asm/irq.h>
29#include <asm/page.h> 27#include <asm/page.h>
30#include <asm/mach-types.h> 28#include <asm/mach-types.h>
31#include <asm/setup.h> 29#include <asm/setup.h>
@@ -34,6 +32,9 @@
34#include <asm/mach/map.h> 32#include <asm/mach/map.h>
35#include <asm/mach/serial_sa1100.h> 33#include <asm/mach/serial_sa1100.h>
36 34
35#include <mach/hardware.h>
36#include <mach/irqs.h>
37
37#include "generic.h" 38#include "generic.h"
38 39
39/* 40/*
@@ -344,6 +345,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720")
344 /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */ 345 /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
345 .atag_offset = 0x100, 346 .atag_offset = 0x100,
346 .map_io = jornada720_map_io, 347 .map_io = jornada720_map_io,
348 .nr_irqs = SA1100_NR_IRQS,
347 .init_irq = sa1100_init_irq, 349 .init_irq = sa1100_init_irq,
348 .timer = &sa1100_timer, 350 .timer = &sa1100_timer,
349 .init_machine = jornada720_mach_init, 351 .init_machine = jornada720_mach_init,
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index 570f75fb73a2..eb6534e0b0d0 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -17,6 +17,7 @@
17#include <asm/mach/map.h> 17#include <asm/mach/map.h>
18#include <asm/mach/serial_sa1100.h> 18#include <asm/mach/serial_sa1100.h>
19#include <mach/mcp.h> 19#include <mach/mcp.h>
20#include <mach/irqs.h>
20 21
21#include "generic.h" 22#include "generic.h"
22 23
@@ -143,6 +144,7 @@ static void __init lart_map_io(void)
143MACHINE_START(LART, "LART") 144MACHINE_START(LART, "LART")
144 .atag_offset = 0x100, 145 .atag_offset = 0x100,
145 .map_io = lart_map_io, 146 .map_io = lart_map_io,
147 .nr_irqs = SA1100_NR_IRQS,
146 .init_irq = sa1100_init_irq, 148 .init_irq = sa1100_init_irq,
147 .init_machine = lart_init, 149 .init_machine = lart_init,
148 .timer = &sa1100_timer, 150 .timer = &sa1100_timer,
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c
index 3923911000de..8f6446b9f025 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -28,6 +28,7 @@
28 28
29#include <mach/hardware.h> 29#include <mach/hardware.h>
30#include <mach/nanoengine.h> 30#include <mach/nanoengine.h>
31#include <mach/irqs.h>
31 32
32#include "generic.h" 33#include "generic.h"
33 34
@@ -107,6 +108,7 @@ static void __init nanoengine_init(void)
107MACHINE_START(NANOENGINE, "BSE nanoEngine") 108MACHINE_START(NANOENGINE, "BSE nanoEngine")
108 .atag_offset = 0x100, 109 .atag_offset = 0x100,
109 .map_io = nanoengine_map_io, 110 .map_io = nanoengine_map_io,
111 .nr_irqs = SA1100_NR_IRQS,
110 .init_irq = sa1100_init_irq, 112 .init_irq = sa1100_init_irq,
111 .timer = &sa1100_timer, 113 .timer = &sa1100_timer,
112 .init_machine = nanoengine_init, 114 .init_machine = nanoengine_init,
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 3297aa22cd77..b04a8f1928fc 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -21,6 +21,7 @@
21#include <mach/hardware.h> 21#include <mach/hardware.h>
22#include <mach/assabet.h> 22#include <mach/assabet.h>
23#include <mach/neponset.h> 23#include <mach/neponset.h>
24#include <mach/irqs.h>
24 25
25#define NEP_IRQ_SMC91X 0 26#define NEP_IRQ_SMC91X 0
26#define NEP_IRQ_USAR 1 27#define NEP_IRQ_USAR 1
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index ca5d33b6041a..1602575a0d5c 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -131,6 +131,7 @@ static void __init pleb_map_io(void)
131 131
132MACHINE_START(PLEB, "PLEB") 132MACHINE_START(PLEB, "PLEB")
133 .map_io = pleb_map_io, 133 .map_io = pleb_map_io,
134 .nr_irqs = SA1100_NR_IRQS,
134 .init_irq = sa1100_init_irq, 135 .init_irq = sa1100_init_irq,
135 .timer = &sa1100_timer, 136 .timer = &sa1100_timer,
136 .init_machine = pleb_init, 137 .init_machine = pleb_init,
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 08bb1228961f..ca8bf59b9047 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -21,6 +21,7 @@
21#include <asm/mach/serial_sa1100.h> 21#include <asm/mach/serial_sa1100.h>
22#include <mach/mcp.h> 22#include <mach/mcp.h>
23#include <mach/shannon.h> 23#include <mach/shannon.h>
24#include <mach/irqs.h>
24 25
25#include "generic.h" 26#include "generic.h"
26 27
@@ -99,6 +100,7 @@ static void __init shannon_map_io(void)
99MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") 100MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
100 .atag_offset = 0x100, 101 .atag_offset = 0x100,
101 .map_io = shannon_map_io, 102 .map_io = shannon_map_io,
103 .nr_irqs = SA1100_NR_IRQS,
102 .init_irq = sa1100_init_irq, 104 .init_irq = sa1100_init_irq,
103 .timer = &sa1100_timer, 105 .timer = &sa1100_timer,
104 .init_machine = shannon_init, 106 .init_machine = shannon_init,
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 3da4c1f11cf5..3efae03cb3d7 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -7,7 +7,7 @@
7#include <linux/kernel.h> 7#include <linux/kernel.h>
8#include <linux/tty.h> 8#include <linux/tty.h>
9#include <linux/proc_fs.h> 9#include <linux/proc_fs.h>
10#include <linux/string.h> 10#include <linux/string.h>
11#include <linux/pm.h> 11#include <linux/pm.h>
12#include <linux/platform_device.h> 12#include <linux/platform_device.h>
13#include <linux/mfd/ucb1x00.h> 13#include <linux/mfd/ucb1x00.h>
@@ -16,7 +16,6 @@
16#include <linux/io.h> 16#include <linux/io.h>
17#include <linux/gpio.h> 17#include <linux/gpio.h>
18 18
19#include <asm/irq.h>
20#include <mach/hardware.h> 19#include <mach/hardware.h>
21#include <asm/setup.h> 20#include <asm/setup.h>
22 21
@@ -27,6 +26,7 @@
27#include <asm/mach/serial_sa1100.h> 26#include <asm/mach/serial_sa1100.h>
28#include <mach/mcp.h> 27#include <mach/mcp.h>
29#include <mach/simpad.h> 28#include <mach/simpad.h>
29#include <mach/irqs.h>
30 30
31#include <linux/serial_core.h> 31#include <linux/serial_core.h>
32#include <linux/ioport.h> 32#include <linux/ioport.h>
@@ -393,6 +393,7 @@ MACHINE_START(SIMPAD, "Simpad")
393 /* Maintainer: Holger Freyther */ 393 /* Maintainer: Holger Freyther */
394 .atag_offset = 0x100, 394 .atag_offset = 0x100,
395 .map_io = simpad_map_io, 395 .map_io = simpad_map_io,
396 .nr_irqs = SA1100_NR_IRQS,
396 .init_irq = sa1100_init_irq, 397 .init_irq = sa1100_init_irq,
397 .timer = &sa1100_timer, 398 .timer = &sa1100_timer,
398 .restart = sa11x0_restart, 399 .restart = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index b20ff93b84a5..e22fca9ad5ec 100644
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -19,8 +19,8 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/io.h> 20#include <linux/io.h>
21 21
22#include <asm/irq.h>
23#include <mach/hardware.h> 22#include <mach/hardware.h>
23#include <mach/irqs.h>
24#include <asm/hardware/ssp.h> 24#include <asm/hardware/ssp.h>
25 25
26#define TIMEOUT 100000 26#define TIMEOUT 100000
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 69e33535dee6..6af26e8d55e6 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -18,6 +18,7 @@
18#include <asm/mach/time.h> 18#include <asm/mach/time.h>
19#include <asm/sched_clock.h> 19#include <asm/sched_clock.h>
20#include <mach/hardware.h> 20#include <mach/hardware.h>
21#include <mach/irqs.h>
21 22
22static u32 notrace sa1100_read_sched_clock(void) 23static u32 notrace sa1100_read_sched_clock(void)
23{ 24{
diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
index 7eecf69362ee..8ea3b33d4b40 100644
--- a/drivers/gpio/gpio-sa1100.c
+++ b/drivers/gpio/gpio-sa1100.c
@@ -12,6 +12,7 @@
12#include <linux/module.h> 12#include <linux/module.h>
13 13
14#include <mach/hardware.h> 14#include <mach/hardware.h>
15#include <mach/irqs.h>
15 16
16static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) 17static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)
17{ 18{
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index ef7a21a6a01b..2ca5959ec3fa 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -38,6 +38,7 @@
38 38
39#include <asm/irq.h> 39#include <asm/irq.h>
40#include <mach/hardware.h> 40#include <mach/hardware.h>
41#include <mach/irqs.h>
41#include <asm/mach/serial_sa1100.h> 42#include <asm/mach/serial_sa1100.h>
42 43
43/* We've been assigned a range on the "Low-density serial ports" major */ 44/* We've been assigned a range on the "Low-density serial ports" major */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 04:12:17 -0500