diff options
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/board-edosk7705.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/board-edosk7760.c | 15 | ||||
-rw-r--r-- | arch/sh/boards/board-espt.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/board-magicpanelr2.c | 27 | ||||
-rw-r--r-- | arch/sh/boards/board-sh7757lcr.c | 27 | ||||
-rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 15 | ||||
-rw-r--r-- | arch/sh/boards/board-urquell.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 15 | ||||
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 44 | ||||
-rw-r--r-- | arch/sh/boards/mach-hp6xx/setup.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/mach-kfr2r09/setup.c | 15 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 13 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7722/setup.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 31 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh7763rdp/setup.c | 5 |
15 files changed, 118 insertions, 104 deletions
diff --git a/arch/sh/boards/board-edosk7705.c b/arch/sh/boards/board-edosk7705.c index 541d8a281035..0a531a1f6e23 100644 --- a/arch/sh/boards/board-edosk7705.c +++ b/arch/sh/boards/board-edosk7705.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
15 | #include <linux/smc91x.h> | 15 | #include <linux/smc91x.h> |
16 | #include <linux/sh_intc.h> | ||
16 | #include <asm/machvec.h> | 17 | #include <asm/machvec.h> |
17 | #include <asm/sizes.h> | 18 | #include <asm/sizes.h> |
18 | 19 | ||
@@ -20,7 +21,7 @@ | |||
20 | #define SMC_IO_OFFSET 0x300 | 21 | #define SMC_IO_OFFSET 0x300 |
21 | #define SMC_IOADDR (SMC_IOBASE + SMC_IO_OFFSET) | 22 | #define SMC_IOADDR (SMC_IOBASE + SMC_IO_OFFSET) |
22 | 23 | ||
23 | #define ETHERNET_IRQ 0x09 | 24 | #define ETHERNET_IRQ evt2irq(0x320) |
24 | 25 | ||
25 | static void __init sh_edosk7705_init_irq(void) | 26 | static void __init sh_edosk7705_init_irq(void) |
26 | { | 27 | { |
diff --git a/arch/sh/boards/board-edosk7760.c b/arch/sh/boards/board-edosk7760.c index e9656a2cc4cc..d4871d274fb9 100644 --- a/arch/sh/boards/board-edosk7760.c +++ b/arch/sh/boards/board-edosk7760.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/smc91x.h> | 24 | #include <linux/smc91x.h> |
25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
26 | #include <linux/sh_intc.h> | ||
26 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
27 | #include <linux/mtd/physmap.h> | 28 | #include <linux/mtd/physmap.h> |
28 | #include <asm/machvec.h> | 29 | #include <asm/machvec.h> |
@@ -40,8 +41,6 @@ | |||
40 | #define SMC_IO_OFFSET 0x300 | 41 | #define SMC_IO_OFFSET 0x300 |
41 | #define SMC_IOADDR (SMC_IOBASE + SMC_IO_OFFSET) | 42 | #define SMC_IOADDR (SMC_IOBASE + SMC_IO_OFFSET) |
42 | 43 | ||
43 | #define ETHERNET_IRQ 5 | ||
44 | |||
45 | /* NOR flash */ | 44 | /* NOR flash */ |
46 | static struct mtd_partition edosk7760_nor_flash_partitions[] = { | 45 | static struct mtd_partition edosk7760_nor_flash_partitions[] = { |
47 | { | 46 | { |
@@ -99,8 +98,8 @@ static struct resource sh7760_i2c1_res[] = { | |||
99 | .end = SH7760_I2C1_MMIOEND, | 98 | .end = SH7760_I2C1_MMIOEND, |
100 | .flags = IORESOURCE_MEM, | 99 | .flags = IORESOURCE_MEM, |
101 | },{ | 100 | },{ |
102 | .start = SH7760_I2C1_IRQ, | 101 | .start = evt2irq(0x9e0), |
103 | .end = SH7760_I2C1_IRQ, | 102 | .end = evt2irq(0x9e0), |
104 | .flags = IORESOURCE_IRQ, | 103 | .flags = IORESOURCE_IRQ, |
105 | }, | 104 | }, |
106 | }; | 105 | }; |
@@ -122,8 +121,8 @@ static struct resource sh7760_i2c0_res[] = { | |||
122 | .end = SH7760_I2C0_MMIOEND, | 121 | .end = SH7760_I2C0_MMIOEND, |
123 | .flags = IORESOURCE_MEM, | 122 | .flags = IORESOURCE_MEM, |
124 | }, { | 123 | }, { |
125 | .start = SH7760_I2C0_IRQ, | 124 | .start = evt2irq(0x9c0), |
126 | .end = SH7760_I2C0_IRQ, | 125 | .end = evt2irq(0x9c0), |
127 | .flags = IORESOURCE_IRQ, | 126 | .flags = IORESOURCE_IRQ, |
128 | }, | 127 | }, |
129 | }; | 128 | }; |
@@ -150,8 +149,8 @@ static struct resource smc91x_res[] = { | |||
150 | .flags = IORESOURCE_MEM, | 149 | .flags = IORESOURCE_MEM, |
151 | }, | 150 | }, |
152 | [1] = { | 151 | [1] = { |
153 | .start = ETHERNET_IRQ, | 152 | .start = evt2irq(0x2a0), |
154 | .end = ETHERNET_IRQ, | 153 | .end = evt2irq(0x2a0), |
155 | .flags = IORESOURCE_IRQ , | 154 | .flags = IORESOURCE_IRQ , |
156 | } | 155 | } |
157 | }; | 156 | }; |
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c index b3ae9d38cbc0..6cba0a7068bc 100644 --- a/arch/sh/boards/board-espt.c +++ b/arch/sh/boards/board-espt.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/mtd/physmap.h> | 14 | #include <linux/mtd/physmap.h> |
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include <linux/sh_eth.h> | 16 | #include <linux/sh_eth.h> |
17 | #include <linux/sh_intc.h> | ||
17 | #include <asm/machvec.h> | 18 | #include <asm/machvec.h> |
18 | #include <asm/sizes.h> | 19 | #include <asm/sizes.h> |
19 | 20 | ||
@@ -71,7 +72,7 @@ static struct resource sh_eth_resources[] = { | |||
71 | .flags = IORESOURCE_MEM, | 72 | .flags = IORESOURCE_MEM, |
72 | }, { | 73 | }, { |
73 | 74 | ||
74 | .start = 57, /* irq number */ | 75 | .start = evt2irq(0x920), /* irq number */ |
75 | .flags = IORESOURCE_IRQ, | 76 | .flags = IORESOURCE_IRQ, |
76 | }, | 77 | }, |
77 | }; | 78 | }; |
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c index b2ca1d9948fb..90568f9de3a4 100644 --- a/arch/sh/boards/board-magicpanelr2.c +++ b/arch/sh/boards/board-magicpanelr2.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/mtd/partitions.h> | 19 | #include <linux/mtd/partitions.h> |
20 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
21 | #include <linux/mtd/map.h> | 21 | #include <linux/mtd/map.h> |
22 | #include <linux/sh_intc.h> | ||
22 | #include <mach/magicpanelr2.h> | 23 | #include <mach/magicpanelr2.h> |
23 | #include <asm/heartbeat.h> | 24 | #include <asm/heartbeat.h> |
24 | #include <cpu/sh7720.h> | 25 | #include <cpu/sh7720.h> |
@@ -245,8 +246,8 @@ static struct resource smsc911x_resources[] = { | |||
245 | .flags = IORESOURCE_MEM, | 246 | .flags = IORESOURCE_MEM, |
246 | }, | 247 | }, |
247 | [1] = { | 248 | [1] = { |
248 | .start = 35, | 249 | .start = evt2irq(0x660), |
249 | .end = 35, | 250 | .end = evt2irq(0x660), |
250 | .flags = IORESOURCE_IRQ, | 251 | .flags = IORESOURCE_IRQ, |
251 | }, | 252 | }, |
252 | }; | 253 | }; |
@@ -358,17 +359,17 @@ static void __init init_mpr2_IRQ(void) | |||
358 | { | 359 | { |
359 | plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */ | 360 | plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */ |
360 | 361 | ||
361 | irq_set_irq_type(32, IRQ_TYPE_LEVEL_LOW); /* IRQ0 CAN1 */ | 362 | irq_set_irq_type(evt2irq(0x600), IRQ_TYPE_LEVEL_LOW); /* IRQ0 CAN1 */ |
362 | irq_set_irq_type(33, IRQ_TYPE_LEVEL_LOW); /* IRQ1 CAN2 */ | 363 | irq_set_irq_type(evt2irq(0x620), IRQ_TYPE_LEVEL_LOW); /* IRQ1 CAN2 */ |
363 | irq_set_irq_type(34, IRQ_TYPE_LEVEL_LOW); /* IRQ2 CAN3 */ | 364 | irq_set_irq_type(evt2irq(0x640), IRQ_TYPE_LEVEL_LOW); /* IRQ2 CAN3 */ |
364 | irq_set_irq_type(35, IRQ_TYPE_LEVEL_LOW); /* IRQ3 SMSC9115 */ | 365 | irq_set_irq_type(evt2irq(0x660), IRQ_TYPE_LEVEL_LOW); /* IRQ3 SMSC9115 */ |
365 | irq_set_irq_type(36, IRQ_TYPE_EDGE_RISING); /* IRQ4 touchscreen */ | 366 | irq_set_irq_type(evt2irq(0x680), IRQ_TYPE_EDGE_RISING); /* IRQ4 touchscreen */ |
366 | irq_set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */ | 367 | irq_set_irq_type(evt2irq(0x6a0), IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */ |
367 | 368 | ||
368 | intc_set_priority(32, 13); /* IRQ0 CAN1 */ | 369 | intc_set_priority(evt2irq(0x600), 13); /* IRQ0 CAN1 */ |
369 | intc_set_priority(33, 13); /* IRQ0 CAN2 */ | 370 | intc_set_priority(evt2irq(0x620), 13); /* IRQ0 CAN2 */ |
370 | intc_set_priority(34, 13); /* IRQ0 CAN3 */ | 371 | intc_set_priority(evt2irq(0x640), 13); /* IRQ0 CAN3 */ |
371 | intc_set_priority(35, 6); /* IRQ3 SMSC9115 */ | 372 | intc_set_priority(evt2irq(0x660), 6); /* IRQ3 SMSC9115 */ |
372 | } | 373 | } |
373 | 374 | ||
374 | /* | 375 | /* |
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index 24b1ee410daa..5087f8bb4cff 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/mmc/sh_mmcif.h> | 19 | #include <linux/mmc/sh_mmcif.h> |
20 | #include <linux/mmc/sh_mobile_sdhi.h> | 20 | #include <linux/mmc/sh_mobile_sdhi.h> |
21 | #include <linux/sh_eth.h> | 21 | #include <linux/sh_eth.h> |
22 | #include <linux/sh_intc.h> | ||
22 | #include <linux/usb/renesas_usbhs.h> | 23 | #include <linux/usb/renesas_usbhs.h> |
23 | #include <cpu/sh7757.h> | 24 | #include <cpu/sh7757.h> |
24 | #include <asm/heartbeat.h> | 25 | #include <asm/heartbeat.h> |
@@ -65,8 +66,8 @@ static struct resource sh_eth0_resources[] = { | |||
65 | .end = 0xfef001ff, | 66 | .end = 0xfef001ff, |
66 | .flags = IORESOURCE_MEM, | 67 | .flags = IORESOURCE_MEM, |
67 | }, { | 68 | }, { |
68 | .start = 84, | 69 | .start = evt2irq(0xc80), |
69 | .end = 84, | 70 | .end = evt2irq(0xc80), |
70 | .flags = IORESOURCE_IRQ, | 71 | .flags = IORESOURCE_IRQ, |
71 | }, | 72 | }, |
72 | }; | 73 | }; |
@@ -94,8 +95,8 @@ static struct resource sh_eth1_resources[] = { | |||
94 | .end = 0xfef009ff, | 95 | .end = 0xfef009ff, |
95 | .flags = IORESOURCE_MEM, | 96 | .flags = IORESOURCE_MEM, |
96 | }, { | 97 | }, { |
97 | .start = 84, | 98 | .start = evt2irq(0xc80), |
98 | .end = 84, | 99 | .end = evt2irq(0xc80), |
99 | .flags = IORESOURCE_IRQ, | 100 | .flags = IORESOURCE_IRQ, |
100 | }, | 101 | }, |
101 | }; | 102 | }; |
@@ -139,8 +140,8 @@ static struct resource sh_eth_giga0_resources[] = { | |||
139 | .end = 0xfee01fff, | 140 | .end = 0xfee01fff, |
140 | .flags = IORESOURCE_MEM, | 141 | .flags = IORESOURCE_MEM, |
141 | }, { | 142 | }, { |
142 | .start = 315, | 143 | .start = evt2irq(0x2960), |
143 | .end = 315, | 144 | .end = evt2irq(0x2960), |
144 | .flags = IORESOURCE_IRQ, | 145 | .flags = IORESOURCE_IRQ, |
145 | }, | 146 | }, |
146 | }; | 147 | }; |
@@ -174,8 +175,8 @@ static struct resource sh_eth_giga1_resources[] = { | |||
174 | .end = 0xfee01fff, | 175 | .end = 0xfee01fff, |
175 | .flags = IORESOURCE_MEM, | 176 | .flags = IORESOURCE_MEM, |
176 | }, { | 177 | }, { |
177 | .start = 316, | 178 | .start = evt2irq(0x2980), |
178 | .end = 316, | 179 | .end = evt2irq(0x2980), |
179 | .flags = IORESOURCE_IRQ, | 180 | .flags = IORESOURCE_IRQ, |
180 | }, | 181 | }, |
181 | }; | 182 | }; |
@@ -206,11 +207,11 @@ static struct resource sh_mmcif_resources[] = { | |||
206 | .flags = IORESOURCE_MEM, | 207 | .flags = IORESOURCE_MEM, |
207 | }, | 208 | }, |
208 | [1] = { | 209 | [1] = { |
209 | .start = 211, | 210 | .start = evt2irq(0x1c60), |
210 | .flags = IORESOURCE_IRQ, | 211 | .flags = IORESOURCE_IRQ, |
211 | }, | 212 | }, |
212 | [2] = { | 213 | [2] = { |
213 | .start = 212, | 214 | .start = evt2irq(0x1c80), |
214 | .flags = IORESOURCE_IRQ, | 215 | .flags = IORESOURCE_IRQ, |
215 | }, | 216 | }, |
216 | }; | 217 | }; |
@@ -248,7 +249,7 @@ static struct resource sdhi_resources[] = { | |||
248 | .flags = IORESOURCE_MEM, | 249 | .flags = IORESOURCE_MEM, |
249 | }, | 250 | }, |
250 | [1] = { | 251 | [1] = { |
251 | .start = 20, | 252 | .start = evt2irq(0x480), |
252 | .flags = IORESOURCE_IRQ, | 253 | .flags = IORESOURCE_IRQ, |
253 | }, | 254 | }, |
254 | }; | 255 | }; |
@@ -284,8 +285,8 @@ static struct resource usb0_resources[] = { | |||
284 | .flags = IORESOURCE_MEM, | 285 | .flags = IORESOURCE_MEM, |
285 | }, | 286 | }, |
286 | [1] = { | 287 | [1] = { |
287 | .start = 50, | 288 | .start = evt2irq(0x840), |
288 | .end = 50, | 289 | .end = evt2irq(0x840), |
289 | .flags = IORESOURCE_IRQ, | 290 | .flags = IORESOURCE_IRQ, |
290 | }, | 291 | }, |
291 | }; | 292 | }; |
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index d0d6221d7c2e..2c4771ee84cd 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/i2c-pca-platform.h> | 20 | #include <linux/i2c-pca-platform.h> |
21 | #include <linux/i2c-algo-pca.h> | 21 | #include <linux/i2c-algo-pca.h> |
22 | #include <linux/usb/r8a66597.h> | 22 | #include <linux/usb/r8a66597.h> |
23 | #include <linux/sh_intc.h> | ||
23 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
24 | #include <linux/io.h> | 25 | #include <linux/io.h> |
25 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
@@ -105,8 +106,8 @@ static struct resource r8a66597_usb_host_resources[] = { | |||
105 | .flags = IORESOURCE_MEM, | 106 | .flags = IORESOURCE_MEM, |
106 | }, | 107 | }, |
107 | [1] = { | 108 | [1] = { |
108 | .start = 2, | 109 | .start = evt2irq(0x240), |
109 | .end = 2, | 110 | .end = evt2irq(0x240), |
110 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 111 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
111 | }, | 112 | }, |
112 | }; | 113 | }; |
@@ -135,7 +136,7 @@ static struct resource sm501_resources[] = { | |||
135 | .flags = IORESOURCE_MEM, | 136 | .flags = IORESOURCE_MEM, |
136 | }, | 137 | }, |
137 | [2] = { | 138 | [2] = { |
138 | .start = 10, | 139 | .start = evt2irq(0x340), |
139 | .flags = IORESOURCE_IRQ, | 140 | .flags = IORESOURCE_IRQ, |
140 | }, | 141 | }, |
141 | }; | 142 | }; |
@@ -223,8 +224,8 @@ static struct resource i2c_proto_resources[] = { | |||
223 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT, | 224 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT, |
224 | }, | 225 | }, |
225 | [1] = { | 226 | [1] = { |
226 | .start = 12, | 227 | .start = evt2irq(0x380), |
227 | .end = 12, | 228 | .end = evt2irq(0x380), |
228 | .flags = IORESOURCE_IRQ, | 229 | .flags = IORESOURCE_IRQ, |
229 | }, | 230 | }, |
230 | }; | 231 | }; |
@@ -236,8 +237,8 @@ static struct resource i2c_resources[] = { | |||
236 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT, | 237 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT, |
237 | }, | 238 | }, |
238 | [1] = { | 239 | [1] = { |
239 | .start = 12, | 240 | .start = evt2irq(0x380), |
240 | .end = 12, | 241 | .end = evt2irq(0x380), |
241 | .flags = IORESOURCE_IRQ, | 242 | .flags = IORESOURCE_IRQ, |
242 | }, | 243 | }, |
243 | }; | 244 | }; |
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c index 24e3316c5c17..b52abcc5259a 100644 --- a/arch/sh/boards/board-urquell.c +++ b/arch/sh/boards/board-urquell.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
23 | #include <linux/sh_intc.h> | ||
23 | #include <mach/urquell.h> | 24 | #include <mach/urquell.h> |
24 | #include <cpu/sh7786.h> | 25 | #include <cpu/sh7786.h> |
25 | #include <asm/heartbeat.h> | 26 | #include <asm/heartbeat.h> |
@@ -78,7 +79,7 @@ static struct resource smc91x_eth_resources[] = { | |||
78 | .flags = IORESOURCE_MEM, | 79 | .flags = IORESOURCE_MEM, |
79 | }, | 80 | }, |
80 | [1] = { | 81 | [1] = { |
81 | .start = 11, | 82 | .start = evt2irq(0x360), |
82 | .flags = IORESOURCE_IRQ, | 83 | .flags = IORESOURCE_IRQ, |
83 | }, | 84 | }, |
84 | }; | 85 | }; |
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 8cf02e343333..f33ebf447073 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/smsc911x.h> | 23 | #include <linux/smsc911x.h> |
24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | #include <linux/sh_intc.h> | ||
26 | #include <media/ov772x.h> | 27 | #include <media/ov772x.h> |
27 | #include <media/soc_camera.h> | 28 | #include <media/soc_camera.h> |
28 | #include <media/soc_camera_platform.h> | 29 | #include <media/soc_camera_platform.h> |
@@ -47,8 +48,8 @@ static struct resource smsc9118_resources[] = { | |||
47 | .flags = IORESOURCE_MEM, | 48 | .flags = IORESOURCE_MEM, |
48 | }, | 49 | }, |
49 | [1] = { | 50 | [1] = { |
50 | .start = 35, | 51 | .start = evt2irq(0x660), |
51 | .end = 35, | 52 | .end = evt2irq(0x660), |
52 | .flags = IORESOURCE_IRQ, | 53 | .flags = IORESOURCE_IRQ, |
53 | } | 54 | } |
54 | }; | 55 | }; |
@@ -166,7 +167,7 @@ static int ap320_wvga_set_brightness(int brightness) | |||
166 | __raw_writew(0, FPGA_BKLREG); | 167 | __raw_writew(0, FPGA_BKLREG); |
167 | gpio_set_value(GPIO_PTS3, 1); | 168 | gpio_set_value(GPIO_PTS3, 1); |
168 | } | 169 | } |
169 | 170 | ||
170 | return 0; | 171 | return 0; |
171 | } | 172 | } |
172 | 173 | ||
@@ -236,7 +237,7 @@ static struct resource lcdc_resources[] = { | |||
236 | .flags = IORESOURCE_MEM, | 237 | .flags = IORESOURCE_MEM, |
237 | }, | 238 | }, |
238 | [1] = { | 239 | [1] = { |
239 | .start = 28, | 240 | .start = evt2irq(0x580), |
240 | .flags = IORESOURCE_IRQ, | 241 | .flags = IORESOURCE_IRQ, |
241 | }, | 242 | }, |
242 | }; | 243 | }; |
@@ -404,7 +405,7 @@ static struct resource ceu_resources[] = { | |||
404 | .flags = IORESOURCE_MEM, | 405 | .flags = IORESOURCE_MEM, |
405 | }, | 406 | }, |
406 | [1] = { | 407 | [1] = { |
407 | .start = 52, | 408 | .start = evt2irq(0x880), |
408 | .flags = IORESOURCE_IRQ, | 409 | .flags = IORESOURCE_IRQ, |
409 | }, | 410 | }, |
410 | [2] = { | 411 | [2] = { |
@@ -430,7 +431,7 @@ static struct resource sdhi0_cn3_resources[] = { | |||
430 | .flags = IORESOURCE_MEM, | 431 | .flags = IORESOURCE_MEM, |
431 | }, | 432 | }, |
432 | [1] = { | 433 | [1] = { |
433 | .start = 100, | 434 | .start = evt2irq(0xe80), |
434 | .flags = IORESOURCE_IRQ, | 435 | .flags = IORESOURCE_IRQ, |
435 | }, | 436 | }, |
436 | }; | 437 | }; |
@@ -457,7 +458,7 @@ static struct resource sdhi1_cn7_resources[] = { | |||
457 | .flags = IORESOURCE_MEM, | 458 | .flags = IORESOURCE_MEM, |
458 | }, | 459 | }, |
459 | [1] = { | 460 | [1] = { |
460 | .start = 23, | 461 | .start = evt2irq(0x4e0), |
461 | .flags = IORESOURCE_IRQ, | 462 | .flags = IORESOURCE_IRQ, |
462 | }, | 463 | }, |
463 | }; | 464 | }; |
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index d12fe9ddf3da..63002c8a0ec8 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
30 | #include <linux/input/sh_keysc.h> | 30 | #include <linux/input/sh_keysc.h> |
31 | #include <linux/sh_eth.h> | 31 | #include <linux/sh_eth.h> |
32 | #include <linux/sh_intc.h> | ||
32 | #include <linux/videodev2.h> | 33 | #include <linux/videodev2.h> |
33 | #include <video/sh_mobile_lcdc.h> | 34 | #include <video/sh_mobile_lcdc.h> |
34 | #include <sound/sh_fsi.h> | 35 | #include <sound/sh_fsi.h> |
@@ -137,7 +138,7 @@ static struct resource sh_eth_resources[] = { | |||
137 | .flags = IORESOURCE_MEM, | 138 | .flags = IORESOURCE_MEM, |
138 | }, | 139 | }, |
139 | [1] = { | 140 | [1] = { |
140 | .start = 91, | 141 | .start = evt2irq(0xd60), |
141 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 142 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
142 | }, | 143 | }, |
143 | }; | 144 | }; |
@@ -178,8 +179,8 @@ static struct resource usb0_host_resources[] = { | |||
178 | .flags = IORESOURCE_MEM, | 179 | .flags = IORESOURCE_MEM, |
179 | }, | 180 | }, |
180 | [1] = { | 181 | [1] = { |
181 | .start = 65, | 182 | .start = evt2irq(0xa20), |
182 | .end = 65, | 183 | .end = evt2irq(0xa20), |
183 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 184 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
184 | }, | 185 | }, |
185 | }; | 186 | }; |
@@ -214,8 +215,8 @@ static struct resource usb1_common_resources[] = { | |||
214 | .flags = IORESOURCE_MEM, | 215 | .flags = IORESOURCE_MEM, |
215 | }, | 216 | }, |
216 | [1] = { | 217 | [1] = { |
217 | .start = 66, | 218 | .start = evt2irq(0xa40), |
218 | .end = 66, | 219 | .end = evt2irq(0xa40), |
219 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 220 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
220 | }, | 221 | }, |
221 | }; | 222 | }; |
@@ -261,8 +262,8 @@ static struct resource usbhs_resources[] = { | |||
261 | .flags = IORESOURCE_MEM, | 262 | .flags = IORESOURCE_MEM, |
262 | }, | 263 | }, |
263 | [1] = { | 264 | [1] = { |
264 | .start = 66, | 265 | .start = evt2irq(0xa40), |
265 | .end = 66, | 266 | .end = evt2irq(0xa40), |
266 | .flags = IORESOURCE_IRQ, | 267 | .flags = IORESOURCE_IRQ, |
267 | }, | 268 | }, |
268 | }; | 269 | }; |
@@ -348,7 +349,7 @@ static struct resource lcdc_resources[] = { | |||
348 | .flags = IORESOURCE_MEM, | 349 | .flags = IORESOURCE_MEM, |
349 | }, | 350 | }, |
350 | [1] = { | 351 | [1] = { |
351 | .start = 106, | 352 | .start = evt2irq(0xf40), |
352 | .flags = IORESOURCE_IRQ, | 353 | .flags = IORESOURCE_IRQ, |
353 | }, | 354 | }, |
354 | }; | 355 | }; |
@@ -375,7 +376,7 @@ static struct resource ceu0_resources[] = { | |||
375 | .flags = IORESOURCE_MEM, | 376 | .flags = IORESOURCE_MEM, |
376 | }, | 377 | }, |
377 | [1] = { | 378 | [1] = { |
378 | .start = 52, | 379 | .start = evt2irq(0x880), |
379 | .flags = IORESOURCE_IRQ, | 380 | .flags = IORESOURCE_IRQ, |
380 | }, | 381 | }, |
381 | [2] = { | 382 | [2] = { |
@@ -406,7 +407,7 @@ static struct resource ceu1_resources[] = { | |||
406 | .flags = IORESOURCE_MEM, | 407 | .flags = IORESOURCE_MEM, |
407 | }, | 408 | }, |
408 | [1] = { | 409 | [1] = { |
409 | .start = 63, | 410 | .start = evt2irq(0x9e0), |
410 | .flags = IORESOURCE_IRQ, | 411 | .flags = IORESOURCE_IRQ, |
411 | }, | 412 | }, |
412 | [2] = { | 413 | [2] = { |
@@ -437,7 +438,7 @@ static struct i2c_board_info i2c1_devices[] = { | |||
437 | }, | 438 | }, |
438 | { | 439 | { |
439 | I2C_BOARD_INFO("lis3lv02d", 0x1c), | 440 | I2C_BOARD_INFO("lis3lv02d", 0x1c), |
440 | .irq = 33, | 441 | .irq = evt2irq(0x620), |
441 | } | 442 | } |
442 | }; | 443 | }; |
443 | 444 | ||
@@ -463,7 +464,7 @@ static struct resource keysc_resources[] = { | |||
463 | .flags = IORESOURCE_MEM, | 464 | .flags = IORESOURCE_MEM, |
464 | }, | 465 | }, |
465 | [1] = { | 466 | [1] = { |
466 | .start = 79, | 467 | .start = evt2irq(0xbe0), |
467 | .flags = IORESOURCE_IRQ, | 468 | .flags = IORESOURCE_IRQ, |
468 | }, | 469 | }, |
469 | }; | 470 | }; |
@@ -479,7 +480,8 @@ static struct platform_device keysc_device = { | |||
479 | }; | 480 | }; |
480 | 481 | ||
481 | /* TouchScreen */ | 482 | /* TouchScreen */ |
482 | #define IRQ0 32 | 483 | #define IRQ0 evt2irq(0x600) |
484 | |||
483 | static int ts_get_pendown_state(void) | 485 | static int ts_get_pendown_state(void) |
484 | { | 486 | { |
485 | int val = 0; | 487 | int val = 0; |
@@ -544,7 +546,7 @@ static struct resource sdhi0_resources[] = { | |||
544 | .flags = IORESOURCE_MEM, | 546 | .flags = IORESOURCE_MEM, |
545 | }, | 547 | }, |
546 | [1] = { | 548 | [1] = { |
547 | .start = 100, | 549 | .start = evt2irq(0xe80), |
548 | .flags = IORESOURCE_IRQ, | 550 | .flags = IORESOURCE_IRQ, |
549 | }, | 551 | }, |
550 | }; | 552 | }; |
@@ -588,7 +590,7 @@ static struct resource sdhi1_resources[] = { | |||
588 | .flags = IORESOURCE_MEM, | 590 | .flags = IORESOURCE_MEM, |
589 | }, | 591 | }, |
590 | [1] = { | 592 | [1] = { |
591 | .start = 23, | 593 | .start = evt2irq(0x4e0), |
592 | .flags = IORESOURCE_IRQ, | 594 | .flags = IORESOURCE_IRQ, |
593 | }, | 595 | }, |
594 | }; | 596 | }; |
@@ -653,7 +655,7 @@ static struct resource msiof0_resources[] = { | |||
653 | .flags = IORESOURCE_MEM, | 655 | .flags = IORESOURCE_MEM, |
654 | }, | 656 | }, |
655 | [1] = { | 657 | [1] = { |
656 | .start = 84, | 658 | .start = evt2irq(0xc80), |
657 | .flags = IORESOURCE_IRQ, | 659 | .flags = IORESOURCE_IRQ, |
658 | }, | 660 | }, |
659 | }; | 661 | }; |
@@ -794,7 +796,7 @@ static struct resource fsi_resources[] = { | |||
794 | .flags = IORESOURCE_MEM, | 796 | .flags = IORESOURCE_MEM, |
795 | }, | 797 | }, |
796 | [1] = { | 798 | [1] = { |
797 | .start = 108, | 799 | .start = evt2irq(0xf80), |
798 | .flags = IORESOURCE_IRQ, | 800 | .flags = IORESOURCE_IRQ, |
799 | }, | 801 | }, |
800 | }; | 802 | }; |
@@ -818,7 +820,7 @@ static struct resource irda_resources[] = { | |||
818 | .flags = IORESOURCE_MEM, | 820 | .flags = IORESOURCE_MEM, |
819 | }, | 821 | }, |
820 | [1] = { | 822 | [1] = { |
821 | .start = 20, | 823 | .start = evt2irq(0x480), |
822 | .flags = IORESOURCE_IRQ, | 824 | .flags = IORESOURCE_IRQ, |
823 | }, | 825 | }, |
824 | }; | 826 | }; |
@@ -855,7 +857,7 @@ static struct resource sh_vou_resources[] = { | |||
855 | .flags = IORESOURCE_MEM, | 857 | .flags = IORESOURCE_MEM, |
856 | }, | 858 | }, |
857 | [1] = { | 859 | [1] = { |
858 | .start = 55, | 860 | .start = evt2irq(0x8e0), |
859 | .flags = IORESOURCE_IRQ, | 861 | .flags = IORESOURCE_IRQ, |
860 | }, | 862 | }, |
861 | }; | 863 | }; |
@@ -891,12 +893,12 @@ static struct resource sh_mmcif_resources[] = { | |||
891 | }, | 893 | }, |
892 | [1] = { | 894 | [1] = { |
893 | /* MMC2I */ | 895 | /* MMC2I */ |
894 | .start = 29, | 896 | .start = evt2irq(0x5a0), |
895 | .flags = IORESOURCE_IRQ, | 897 | .flags = IORESOURCE_IRQ, |
896 | }, | 898 | }, |
897 | [2] = { | 899 | [2] = { |
898 | /* MMC3I */ | 900 | /* MMC3I */ |
899 | .start = 30, | 901 | .start = evt2irq(0x5c0), |
900 | .flags = IORESOURCE_IRQ, | 902 | .flags = IORESOURCE_IRQ, |
901 | }, | 903 | }, |
902 | }; | 904 | }; |
diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c index 8c9add5f4cfa..db34cad1b76c 100644 --- a/arch/sh/boards/mach-hp6xx/setup.c +++ b/arch/sh/boards/mach-hp6xx/setup.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
16 | #include <linux/sh_intc.h> | ||
16 | #include <sound/sh_dac_audio.h> | 17 | #include <sound/sh_dac_audio.h> |
17 | #include <asm/hd64461.h> | 18 | #include <asm/hd64461.h> |
18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
@@ -35,7 +36,7 @@ static struct resource cf_ide_resources[] = { | |||
35 | .flags = IORESOURCE_MEM, | 36 | .flags = IORESOURCE_MEM, |
36 | }, | 37 | }, |
37 | [2] = { | 38 | [2] = { |
38 | .start = 77, | 39 | .start = evt2irq(0xba0), |
39 | .flags = IORESOURCE_IRQ, | 40 | .flags = IORESOURCE_IRQ, |
40 | }, | 41 | }, |
41 | }; | 42 | }; |
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index d04a55d3b877..158c9176e42a 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
24 | #include <linux/usb/r8a66597.h> | 24 | #include <linux/usb/r8a66597.h> |
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | #include <linux/sh_intc.h> | ||
26 | #include <media/rj54n1cb0c.h> | 27 | #include <media/rj54n1cb0c.h> |
27 | #include <media/soc_camera.h> | 28 | #include <media/soc_camera.h> |
28 | #include <media/sh_mobile_ceu.h> | 29 | #include <media/sh_mobile_ceu.h> |
@@ -110,7 +111,7 @@ static struct resource kfr2r09_sh_keysc_resources[] = { | |||
110 | .flags = IORESOURCE_MEM, | 111 | .flags = IORESOURCE_MEM, |
111 | }, | 112 | }, |
112 | [1] = { | 113 | [1] = { |
113 | .start = 79, | 114 | .start = evt2irq(0xbe0), |
114 | .flags = IORESOURCE_IRQ, | 115 | .flags = IORESOURCE_IRQ, |
115 | }, | 116 | }, |
116 | }; | 117 | }; |
@@ -175,7 +176,7 @@ static struct resource kfr2r09_sh_lcdc_resources[] = { | |||
175 | .flags = IORESOURCE_MEM, | 176 | .flags = IORESOURCE_MEM, |
176 | }, | 177 | }, |
177 | [1] = { | 178 | [1] = { |
178 | .start = 106, | 179 | .start = evt2irq(0xf40), |
179 | .flags = IORESOURCE_IRQ, | 180 | .flags = IORESOURCE_IRQ, |
180 | }, | 181 | }, |
181 | }; | 182 | }; |
@@ -200,8 +201,8 @@ static struct resource kfr2r09_usb0_gadget_resources[] = { | |||
200 | .flags = IORESOURCE_MEM, | 201 | .flags = IORESOURCE_MEM, |
201 | }, | 202 | }, |
202 | [1] = { | 203 | [1] = { |
203 | .start = 65, | 204 | .start = evtirq(0xa20), |
204 | .end = 65, | 205 | .end = evtirq(0xa20), |
205 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 206 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
206 | }, | 207 | }, |
207 | }; | 208 | }; |
@@ -230,8 +231,8 @@ static struct resource kfr2r09_ceu_resources[] = { | |||
230 | .flags = IORESOURCE_MEM, | 231 | .flags = IORESOURCE_MEM, |
231 | }, | 232 | }, |
232 | [1] = { | 233 | [1] = { |
233 | .start = 52, | 234 | .start = evt2irq(0x880), |
234 | .end = 52, | 235 | .end = evt2irq(0x880), |
235 | .flags = IORESOURCE_IRQ, | 236 | .flags = IORESOURCE_IRQ, |
236 | }, | 237 | }, |
237 | [2] = { | 238 | [2] = { |
@@ -348,7 +349,7 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = { | |||
348 | .flags = IORESOURCE_MEM, | 349 | .flags = IORESOURCE_MEM, |
349 | }, | 350 | }, |
350 | [1] = { | 351 | [1] = { |
351 | .start = 100, | 352 | .start = evt2irq(0xe80), |
352 | .flags = IORESOURCE_IRQ, | 353 | .flags = IORESOURCE_IRQ, |
353 | }, | 354 | }, |
354 | }; | 355 | }; |
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index ff6f69c6906e..34cd0c5ff2e1 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
25 | #include <linux/sh_intc.h> | ||
25 | #include <video/sh_mobile_lcdc.h> | 26 | #include <video/sh_mobile_lcdc.h> |
26 | #include <media/sh_mobile_ceu.h> | 27 | #include <media/sh_mobile_ceu.h> |
27 | #include <media/ov772x.h> | 28 | #include <media/ov772x.h> |
@@ -54,7 +55,7 @@ static struct resource smc91x_eth_resources[] = { | |||
54 | .flags = IORESOURCE_MEM, | 55 | .flags = IORESOURCE_MEM, |
55 | }, | 56 | }, |
56 | [1] = { | 57 | [1] = { |
57 | .start = 32, /* IRQ0 */ | 58 | .start = evt2irq(0x600), /* IRQ0 */ |
58 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 59 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
59 | }, | 60 | }, |
60 | }; | 61 | }; |
@@ -88,7 +89,7 @@ static struct resource sh_keysc_resources[] = { | |||
88 | .flags = IORESOURCE_MEM, | 89 | .flags = IORESOURCE_MEM, |
89 | }, | 90 | }, |
90 | [1] = { | 91 | [1] = { |
91 | .start = 79, | 92 | .start = evt2irq(0xbe0), |
92 | .flags = IORESOURCE_IRQ, | 93 | .flags = IORESOURCE_IRQ, |
93 | }, | 94 | }, |
94 | }; | 95 | }; |
@@ -285,7 +286,7 @@ static struct resource migor_lcdc_resources[] = { | |||
285 | .flags = IORESOURCE_MEM, | 286 | .flags = IORESOURCE_MEM, |
286 | }, | 287 | }, |
287 | [1] = { | 288 | [1] = { |
288 | .start = 28, | 289 | .start = evt2irq(0x580), |
289 | .flags = IORESOURCE_IRQ, | 290 | .flags = IORESOURCE_IRQ, |
290 | }, | 291 | }, |
291 | }; | 292 | }; |
@@ -368,7 +369,7 @@ static struct resource migor_ceu_resources[] = { | |||
368 | .flags = IORESOURCE_MEM, | 369 | .flags = IORESOURCE_MEM, |
369 | }, | 370 | }, |
370 | [1] = { | 371 | [1] = { |
371 | .start = 52, | 372 | .start = evt2irq(0x880), |
372 | .flags = IORESOURCE_IRQ, | 373 | .flags = IORESOURCE_IRQ, |
373 | }, | 374 | }, |
374 | [2] = { | 375 | [2] = { |
@@ -394,7 +395,7 @@ static struct resource sdhi_cn9_resources[] = { | |||
394 | .flags = IORESOURCE_MEM, | 395 | .flags = IORESOURCE_MEM, |
395 | }, | 396 | }, |
396 | [1] = { | 397 | [1] = { |
397 | .start = 100, | 398 | .start = evt2irq(0xe80), |
398 | .flags = IORESOURCE_IRQ, | 399 | .flags = IORESOURCE_IRQ, |
399 | }, | 400 | }, |
400 | }; | 401 | }; |
@@ -420,7 +421,7 @@ static struct i2c_board_info migor_i2c_devices[] = { | |||
420 | }, | 421 | }, |
421 | { | 422 | { |
422 | I2C_BOARD_INFO("migor_ts", 0x51), | 423 | I2C_BOARD_INFO("migor_ts", 0x51), |
423 | .irq = 38, /* IRQ6 */ | 424 | .irq = evt2irq(0x6c0), /* IRQ6 */ |
424 | }, | 425 | }, |
425 | { | 426 | { |
426 | I2C_BOARD_INFO("wm8978", 0x1a), | 427 | I2C_BOARD_INFO("wm8978", 0x1a), |
diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c index e1963fecd761..8f7f0550cfde 100644 --- a/arch/sh/boards/mach-se/7722/setup.c +++ b/arch/sh/boards/mach-se/7722/setup.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
17 | #include <linux/input/sh_keysc.h> | 17 | #include <linux/input/sh_keysc.h> |
18 | #include <linux/smc91x.h> | 18 | #include <linux/smc91x.h> |
19 | #include <linux/sh_intc.h> | ||
19 | #include <mach-se/mach/se7722.h> | 20 | #include <mach-se/mach/se7722.h> |
20 | #include <mach-se/mach/mrshpc.h> | 21 | #include <mach-se/mach/mrshpc.h> |
21 | #include <asm/machvec.h> | 22 | #include <asm/machvec.h> |
@@ -114,7 +115,7 @@ static struct resource sh_keysc_resources[] = { | |||
114 | .flags = IORESOURCE_MEM, | 115 | .flags = IORESOURCE_MEM, |
115 | }, | 116 | }, |
116 | [1] = { | 117 | [1] = { |
117 | .start = 79, | 118 | .start = evt2irq(0xbe0), |
118 | .flags = IORESOURCE_IRQ, | 119 | .flags = IORESOURCE_IRQ, |
119 | }, | 120 | }, |
120 | }; | 121 | }; |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index c540b16547c3..479cdf876fda 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/input/sh_keysc.h> | 24 | #include <linux/input/sh_keysc.h> |
25 | #include <linux/usb/r8a66597.h> | 25 | #include <linux/usb/r8a66597.h> |
26 | #include <linux/sh_eth.h> | 26 | #include <linux/sh_eth.h> |
27 | #include <linux/sh_intc.h> | ||
27 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
28 | #include <video/sh_mobile_lcdc.h> | 29 | #include <video/sh_mobile_lcdc.h> |
29 | #include <media/sh_mobile_ceu.h> | 30 | #include <media/sh_mobile_ceu.h> |
@@ -197,7 +198,7 @@ static struct resource lcdc_resources[] = { | |||
197 | .flags = IORESOURCE_MEM, | 198 | .flags = IORESOURCE_MEM, |
198 | }, | 199 | }, |
199 | [1] = { | 200 | [1] = { |
200 | .start = 106, | 201 | .start = evt2irq(0xf40), |
201 | .flags = IORESOURCE_IRQ, | 202 | .flags = IORESOURCE_IRQ, |
202 | }, | 203 | }, |
203 | }; | 204 | }; |
@@ -224,7 +225,7 @@ static struct resource ceu0_resources[] = { | |||
224 | .flags = IORESOURCE_MEM, | 225 | .flags = IORESOURCE_MEM, |
225 | }, | 226 | }, |
226 | [1] = { | 227 | [1] = { |
227 | .start = 52, | 228 | .start = evt2irq(0x880), |
228 | .flags = IORESOURCE_IRQ, | 229 | .flags = IORESOURCE_IRQ, |
229 | }, | 230 | }, |
230 | [2] = { | 231 | [2] = { |
@@ -255,7 +256,7 @@ static struct resource ceu1_resources[] = { | |||
255 | .flags = IORESOURCE_MEM, | 256 | .flags = IORESOURCE_MEM, |
256 | }, | 257 | }, |
257 | [1] = { | 258 | [1] = { |
258 | .start = 63, | 259 | .start = evt2irq(0x9e0), |
259 | .flags = IORESOURCE_IRQ, | 260 | .flags = IORESOURCE_IRQ, |
260 | }, | 261 | }, |
261 | [2] = { | 262 | [2] = { |
@@ -289,7 +290,7 @@ static struct resource fsi_resources[] = { | |||
289 | .flags = IORESOURCE_MEM, | 290 | .flags = IORESOURCE_MEM, |
290 | }, | 291 | }, |
291 | [1] = { | 292 | [1] = { |
292 | .start = 108, | 293 | .start = evt2irq(0xf80), |
293 | .flags = IORESOURCE_IRQ, | 294 | .flags = IORESOURCE_IRQ, |
294 | }, | 295 | }, |
295 | }; | 296 | }; |
@@ -343,7 +344,7 @@ static struct resource keysc_resources[] = { | |||
343 | .flags = IORESOURCE_MEM, | 344 | .flags = IORESOURCE_MEM, |
344 | }, | 345 | }, |
345 | [1] = { | 346 | [1] = { |
346 | .start = 79, | 347 | .start = evt2irq(0xbe0), |
347 | .flags = IORESOURCE_IRQ, | 348 | .flags = IORESOURCE_IRQ, |
348 | }, | 349 | }, |
349 | }; | 350 | }; |
@@ -366,7 +367,7 @@ static struct resource sh_eth_resources[] = { | |||
366 | .flags = IORESOURCE_MEM, | 367 | .flags = IORESOURCE_MEM, |
367 | }, | 368 | }, |
368 | [1] = { | 369 | [1] = { |
369 | .start = 91, | 370 | .start = evt2irq(0xd60), |
370 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 371 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
371 | }, | 372 | }, |
372 | }; | 373 | }; |
@@ -397,8 +398,8 @@ static struct resource sh7724_usb0_host_resources[] = { | |||
397 | .flags = IORESOURCE_MEM, | 398 | .flags = IORESOURCE_MEM, |
398 | }, | 399 | }, |
399 | [1] = { | 400 | [1] = { |
400 | .start = 65, | 401 | .start = evt2irq(0xa20), |
401 | .end = 65, | 402 | .end = evt2irq(0xa20), |
402 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 403 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
403 | }, | 404 | }, |
404 | }; | 405 | }; |
@@ -426,8 +427,8 @@ static struct resource sh7724_usb1_gadget_resources[] = { | |||
426 | .flags = IORESOURCE_MEM, | 427 | .flags = IORESOURCE_MEM, |
427 | }, | 428 | }, |
428 | [1] = { | 429 | [1] = { |
429 | .start = 66, | 430 | .start = evt2irq(0xa40), |
430 | .end = 66, | 431 | .end = evt2irq(0xa40), |
431 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, | 432 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, |
432 | }, | 433 | }, |
433 | }; | 434 | }; |
@@ -452,7 +453,7 @@ static struct resource sdhi0_cn7_resources[] = { | |||
452 | .flags = IORESOURCE_MEM, | 453 | .flags = IORESOURCE_MEM, |
453 | }, | 454 | }, |
454 | [1] = { | 455 | [1] = { |
455 | .start = 100, | 456 | .start = evt2irq(0xe80), |
456 | .flags = IORESOURCE_IRQ, | 457 | .flags = IORESOURCE_IRQ, |
457 | }, | 458 | }, |
458 | }; | 459 | }; |
@@ -481,7 +482,7 @@ static struct resource sdhi1_cn8_resources[] = { | |||
481 | .flags = IORESOURCE_MEM, | 482 | .flags = IORESOURCE_MEM, |
482 | }, | 483 | }, |
483 | [1] = { | 484 | [1] = { |
484 | .start = 23, | 485 | .start = evt2irq(0x4e0), |
485 | .flags = IORESOURCE_IRQ, | 486 | .flags = IORESOURCE_IRQ, |
486 | }, | 487 | }, |
487 | }; | 488 | }; |
@@ -511,7 +512,7 @@ static struct resource irda_resources[] = { | |||
511 | .flags = IORESOURCE_MEM, | 512 | .flags = IORESOURCE_MEM, |
512 | }, | 513 | }, |
513 | [1] = { | 514 | [1] = { |
514 | .start = 20, | 515 | .start = evt2irq(0x480), |
515 | .flags = IORESOURCE_IRQ, | 516 | .flags = IORESOURCE_IRQ, |
516 | }, | 517 | }, |
517 | }; | 518 | }; |
@@ -549,7 +550,7 @@ static struct resource sh_vou_resources[] = { | |||
549 | .flags = IORESOURCE_MEM, | 550 | .flags = IORESOURCE_MEM, |
550 | }, | 551 | }, |
551 | [1] = { | 552 | [1] = { |
552 | .start = 55, | 553 | .start = evt2irq(0x8e0), |
553 | .flags = IORESOURCE_IRQ, | 554 | .flags = IORESOURCE_IRQ, |
554 | }, | 555 | }, |
555 | }; | 556 | }; |
@@ -595,6 +596,7 @@ static struct i2c_board_info i2c0_devices[] = { | |||
595 | #define EEPROM_DATA 0xBA20600C | 596 | #define EEPROM_DATA 0xBA20600C |
596 | #define EEPROM_STAT 0xBA206010 | 597 | #define EEPROM_STAT 0xBA206010 |
597 | #define EEPROM_STRT 0xBA206014 | 598 | #define EEPROM_STRT 0xBA206014 |
599 | |||
598 | static int __init sh_eth_is_eeprom_ready(void) | 600 | static int __init sh_eth_is_eeprom_ready(void) |
599 | { | 601 | { |
600 | int t = 10000; | 602 | int t = 10000; |
@@ -651,7 +653,6 @@ extern char ms7724se_sdram_enter_end; | |||
651 | extern char ms7724se_sdram_leave_start; | 653 | extern char ms7724se_sdram_leave_start; |
652 | extern char ms7724se_sdram_leave_end; | 654 | extern char ms7724se_sdram_leave_end; |
653 | 655 | ||
654 | |||
655 | static int __init arch_setup(void) | 656 | static int __init arch_setup(void) |
656 | { | 657 | { |
657 | /* enable I2C device */ | 658 | /* enable I2C device */ |
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c index dd036f1661db..36e8b88cd04e 100644 --- a/arch/sh/boards/mach-sh7763rdp/setup.c +++ b/arch/sh/boards/mach-sh7763rdp/setup.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/sh_eth.h> | 20 | #include <linux/sh_eth.h> |
21 | #include <linux/sh_intc.h> | ||
21 | #include <mach/sh7763rdp.h> | 22 | #include <mach/sh7763rdp.h> |
22 | #include <asm/sh7760fb.h> | 23 | #include <asm/sh7760fb.h> |
23 | 24 | ||
@@ -67,7 +68,7 @@ static struct platform_device sh7763rdp_nor_flash_device = { | |||
67 | * SH-Ether | 68 | * SH-Ether |
68 | * | 69 | * |
69 | * SH Ether of SH7763 has multi IRQ handling. | 70 | * SH Ether of SH7763 has multi IRQ handling. |
70 | * (57,58,59 -> 57) | 71 | * (0x920,0x940,0x960 -> 0x920) |
71 | */ | 72 | */ |
72 | static struct resource sh_eth_resources[] = { | 73 | static struct resource sh_eth_resources[] = { |
73 | { | 74 | { |
@@ -79,7 +80,7 @@ static struct resource sh_eth_resources[] = { | |||
79 | .end = 0xFEE01FFF, | 80 | .end = 0xFEE01FFF, |
80 | .flags = IORESOURCE_MEM, | 81 | .flags = IORESOURCE_MEM, |
81 | }, { | 82 | }, { |
82 | .start = 57, /* irq number */ | 83 | .start = evt2irq(0x920), /* irq number */ |
83 | .flags = IORESOURCE_IRQ, | 84 | .flags = IORESOURCE_IRQ, |
84 | }, | 85 | }, |
85 | }; | 86 | }; |