diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7757.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 |
1 files changed, 150 insertions, 72 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c index 444aca95b20d..749c6388d5a5 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | |||
@@ -26,7 +26,7 @@ static struct plat_sci_port scif2_platform_data = { | |||
26 | 26 | ||
27 | static struct platform_device scif2_device = { | 27 | static struct platform_device scif2_device = { |
28 | .name = "sh-sci", | 28 | .name = "sh-sci", |
29 | .id = 2, | 29 | .id = 0, |
30 | .dev = { | 30 | .dev = { |
31 | .platform_data = &scif2_platform_data, | 31 | .platform_data = &scif2_platform_data, |
32 | }, | 32 | }, |
@@ -41,7 +41,7 @@ static struct plat_sci_port scif3_platform_data = { | |||
41 | 41 | ||
42 | static struct platform_device scif3_device = { | 42 | static struct platform_device scif3_device = { |
43 | .name = "sh-sci", | 43 | .name = "sh-sci", |
44 | .id = 3, | 44 | .id = 1, |
45 | .dev = { | 45 | .dev = { |
46 | .platform_data = &scif3_platform_data, | 46 | .platform_data = &scif3_platform_data, |
47 | }, | 47 | }, |
@@ -56,7 +56,7 @@ static struct plat_sci_port scif4_platform_data = { | |||
56 | 56 | ||
57 | static struct platform_device scif4_device = { | 57 | static struct platform_device scif4_device = { |
58 | .name = "sh-sci", | 58 | .name = "sh-sci", |
59 | .id = 4, | 59 | .id = 2, |
60 | .dev = { | 60 | .dev = { |
61 | .platform_data = &scif4_platform_data, | 61 | .platform_data = &scif4_platform_data, |
62 | }, | 62 | }, |
@@ -163,39 +163,23 @@ enum { | |||
163 | IRL4_HHLL, IRL4_HHLH, IRL4_HHHL, | 163 | IRL4_HHLL, IRL4_HHLH, IRL4_HHHL, |
164 | IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7, | 164 | IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7, |
165 | 165 | ||
166 | SDHI, | 166 | SDHI, DVC, |
167 | DVC, | 167 | IRQ8, IRQ9, IRQ11, IRQ10, IRQ12, IRQ13, IRQ14, IRQ15, |
168 | IRQ8, IRQ9, IRQ10, | 168 | TMU0, TMU1, TMU2, TMU2_TICPI, TMU3, TMU4, TMU5, |
169 | WDT0, | ||
170 | TMU0, TMU1, TMU2, TMU2_TICPI, | ||
171 | HUDI, | 169 | HUDI, |
172 | |||
173 | ARC4, | 170 | ARC4, |
174 | DMAC0, | 171 | DMAC0_5, DMAC6_7, DMAC8_11, |
175 | IRQ11, | 172 | SCIF0, SCIF1, SCIF2, SCIF3, SCIF4, |
176 | SCIF2, | 173 | USB0, USB1, |
177 | DMAC1_6, | ||
178 | USB0, | ||
179 | IRQ12, | ||
180 | JMC, | 174 | JMC, |
181 | SPI1, | 175 | SPI0, SPI1, |
182 | IRQ13, IRQ14, | ||
183 | USB1, | ||
184 | TMR01, TMR23, TMR45, | 176 | TMR01, TMR23, TMR45, |
185 | WDT1, | ||
186 | FRT, | 177 | FRT, |
187 | LPC, | 178 | LPC, LPC5, LPC6, LPC7, LPC8, |
188 | SCIF0, SCIF1, SCIF3, | 179 | PECI0, PECI1, PECI2, PECI3, PECI4, PECI5, |
189 | PECI0I, PECI1I, PECI2I, | ||
190 | IRQ15, | ||
191 | ETHERC, | 180 | ETHERC, |
192 | SPI0, | 181 | ADC0, ADC1, |
193 | ADC1, | ||
194 | DMAC1_8, | ||
195 | SIM, | 182 | SIM, |
196 | TMU3, TMU4, TMU5, | ||
197 | ADC0, | ||
198 | SCIF4, | ||
199 | IIC0_0, IIC0_1, IIC0_2, IIC0_3, | 183 | IIC0_0, IIC0_1, IIC0_2, IIC0_3, |
200 | IIC1_0, IIC1_1, IIC1_2, IIC1_3, | 184 | IIC1_0, IIC1_1, IIC1_2, IIC1_3, |
201 | IIC2_0, IIC2_1, IIC2_2, IIC2_3, | 185 | IIC2_0, IIC2_1, IIC2_2, IIC2_3, |
@@ -206,9 +190,23 @@ enum { | |||
206 | IIC7_0, IIC7_1, IIC7_2, IIC7_3, | 190 | IIC7_0, IIC7_1, IIC7_2, IIC7_3, |
207 | IIC8_0, IIC8_1, IIC8_2, IIC8_3, | 191 | IIC8_0, IIC8_1, IIC8_2, IIC8_3, |
208 | IIC9_0, IIC9_1, IIC9_2, IIC9_3, | 192 | IIC9_0, IIC9_1, IIC9_2, IIC9_3, |
209 | PCIINTA, | 193 | ONFICTL, |
210 | PCIE, | 194 | MMC1, MMC2, |
195 | ECCU, | ||
196 | PCIC, | ||
197 | G200, | ||
198 | RSPI, | ||
211 | SGPIO, | 199 | SGPIO, |
200 | DMINT12, DMINT13, DMINT14, DMINT15, DMINT16, DMINT17, DMINT18, DMINT19, | ||
201 | DMINT20, DMINT21, DMINT22, DMINT23, | ||
202 | DDRECC, | ||
203 | TSIP, | ||
204 | PCIE_BRIDGE, | ||
205 | WDT0B, WDT1B, WDT2B, WDT3B, WDT4B, WDT5B, WDT6B, WDT7B, WDT8B, | ||
206 | GETHER0, GETHER1, GETHER2, | ||
207 | PBIA, PBIB, PBIC, | ||
208 | DMAE2, DMAE3, | ||
209 | SERMUX2, SERMUX3, | ||
212 | 210 | ||
213 | /* interrupt groups */ | 211 | /* interrupt groups */ |
214 | 212 | ||
@@ -221,19 +219,18 @@ static struct intc_vect vectors[] __initdata = { | |||
221 | INTC_VECT(DVC, 0x4e0), | 219 | INTC_VECT(DVC, 0x4e0), |
222 | INTC_VECT(IRQ8, 0x500), INTC_VECT(IRQ9, 0x520), | 220 | INTC_VECT(IRQ8, 0x500), INTC_VECT(IRQ9, 0x520), |
223 | INTC_VECT(IRQ10, 0x540), | 221 | INTC_VECT(IRQ10, 0x540), |
224 | INTC_VECT(WDT0, 0x560), | ||
225 | INTC_VECT(TMU0, 0x580), INTC_VECT(TMU1, 0x5a0), | 222 | INTC_VECT(TMU0, 0x580), INTC_VECT(TMU1, 0x5a0), |
226 | INTC_VECT(TMU2, 0x5c0), INTC_VECT(TMU2_TICPI, 0x5e0), | 223 | INTC_VECT(TMU2, 0x5c0), INTC_VECT(TMU2_TICPI, 0x5e0), |
227 | INTC_VECT(HUDI, 0x600), | 224 | INTC_VECT(HUDI, 0x600), |
228 | INTC_VECT(ARC4, 0x620), | 225 | INTC_VECT(ARC4, 0x620), |
229 | INTC_VECT(DMAC0, 0x640), INTC_VECT(DMAC0, 0x660), | 226 | INTC_VECT(DMAC0_5, 0x640), INTC_VECT(DMAC0_5, 0x660), |
230 | INTC_VECT(DMAC0, 0x680), INTC_VECT(DMAC0, 0x6a0), | 227 | INTC_VECT(DMAC0_5, 0x680), INTC_VECT(DMAC0_5, 0x6a0), |
231 | INTC_VECT(DMAC0, 0x6c0), | 228 | INTC_VECT(DMAC0_5, 0x6c0), |
232 | INTC_VECT(IRQ11, 0x6e0), | 229 | INTC_VECT(IRQ11, 0x6e0), |
233 | INTC_VECT(SCIF2, 0x700), INTC_VECT(SCIF2, 0x720), | 230 | INTC_VECT(SCIF2, 0x700), INTC_VECT(SCIF2, 0x720), |
234 | INTC_VECT(SCIF2, 0x740), INTC_VECT(SCIF2, 0x760), | 231 | INTC_VECT(SCIF2, 0x740), INTC_VECT(SCIF2, 0x760), |
235 | INTC_VECT(DMAC0, 0x780), INTC_VECT(DMAC0, 0x7a0), | 232 | INTC_VECT(DMAC0_5, 0x780), INTC_VECT(DMAC0_5, 0x7a0), |
236 | INTC_VECT(DMAC1_6, 0x7c0), INTC_VECT(DMAC1_6, 0x7e0), | 233 | INTC_VECT(DMAC6_7, 0x7c0), INTC_VECT(DMAC6_7, 0x7e0), |
237 | INTC_VECT(USB0, 0x840), | 234 | INTC_VECT(USB0, 0x840), |
238 | INTC_VECT(IRQ12, 0x880), | 235 | INTC_VECT(IRQ12, 0x880), |
239 | INTC_VECT(JMC, 0x8a0), | 236 | INTC_VECT(JMC, 0x8a0), |
@@ -242,7 +239,6 @@ static struct intc_vect vectors[] __initdata = { | |||
242 | INTC_VECT(USB1, 0x920), | 239 | INTC_VECT(USB1, 0x920), |
243 | INTC_VECT(TMR01, 0xa00), INTC_VECT(TMR23, 0xa20), | 240 | INTC_VECT(TMR01, 0xa00), INTC_VECT(TMR23, 0xa20), |
244 | INTC_VECT(TMR45, 0xa40), | 241 | INTC_VECT(TMR45, 0xa40), |
245 | INTC_VECT(WDT1, 0xa60), | ||
246 | INTC_VECT(FRT, 0xa80), | 242 | INTC_VECT(FRT, 0xa80), |
247 | INTC_VECT(LPC, 0xaa0), INTC_VECT(LPC, 0xac0), | 243 | INTC_VECT(LPC, 0xaa0), INTC_VECT(LPC, 0xac0), |
248 | INTC_VECT(LPC, 0xae0), INTC_VECT(LPC, 0xb00), | 244 | INTC_VECT(LPC, 0xae0), INTC_VECT(LPC, 0xb00), |
@@ -250,14 +246,14 @@ static struct intc_vect vectors[] __initdata = { | |||
250 | INTC_VECT(SCIF0, 0xb40), INTC_VECT(SCIF1, 0xb60), | 246 | INTC_VECT(SCIF0, 0xb40), INTC_VECT(SCIF1, 0xb60), |
251 | INTC_VECT(SCIF3, 0xb80), INTC_VECT(SCIF3, 0xba0), | 247 | INTC_VECT(SCIF3, 0xb80), INTC_VECT(SCIF3, 0xba0), |
252 | INTC_VECT(SCIF3, 0xbc0), INTC_VECT(SCIF3, 0xbe0), | 248 | INTC_VECT(SCIF3, 0xbc0), INTC_VECT(SCIF3, 0xbe0), |
253 | INTC_VECT(PECI0I, 0xc00), INTC_VECT(PECI1I, 0xc20), | 249 | INTC_VECT(PECI0, 0xc00), INTC_VECT(PECI1, 0xc20), |
254 | INTC_VECT(PECI2I, 0xc40), | 250 | INTC_VECT(PECI2, 0xc40), |
255 | INTC_VECT(IRQ15, 0xc60), | 251 | INTC_VECT(IRQ15, 0xc60), |
256 | INTC_VECT(ETHERC, 0xc80), INTC_VECT(ETHERC, 0xca0), | 252 | INTC_VECT(ETHERC, 0xc80), INTC_VECT(ETHERC, 0xca0), |
257 | INTC_VECT(SPI0, 0xcc0), | 253 | INTC_VECT(SPI0, 0xcc0), |
258 | INTC_VECT(ADC1, 0xce0), | 254 | INTC_VECT(ADC1, 0xce0), |
259 | INTC_VECT(DMAC1_8, 0xd00), INTC_VECT(DMAC1_8, 0xd20), | 255 | INTC_VECT(DMAC8_11, 0xd00), INTC_VECT(DMAC8_11, 0xd20), |
260 | INTC_VECT(DMAC1_8, 0xd40), INTC_VECT(DMAC1_8, 0xd60), | 256 | INTC_VECT(DMAC8_11, 0xd40), INTC_VECT(DMAC8_11, 0xd60), |
261 | INTC_VECT(SIM, 0xd80), INTC_VECT(SIM, 0xda0), | 257 | INTC_VECT(SIM, 0xd80), INTC_VECT(SIM, 0xda0), |
262 | INTC_VECT(SIM, 0xdc0), INTC_VECT(SIM, 0xde0), | 258 | INTC_VECT(SIM, 0xdc0), INTC_VECT(SIM, 0xde0), |
263 | INTC_VECT(TMU3, 0xe00), INTC_VECT(TMU4, 0xe20), | 259 | INTC_VECT(TMU3, 0xe00), INTC_VECT(TMU4, 0xe20), |
@@ -278,17 +274,47 @@ static struct intc_vect vectors[] __initdata = { | |||
278 | INTC_VECT(IIC5_0, 0x1860), INTC_VECT(IIC5_1, 0x1880), | 274 | INTC_VECT(IIC5_0, 0x1860), INTC_VECT(IIC5_1, 0x1880), |
279 | INTC_VECT(IIC5_2, 0x18a0), INTC_VECT(IIC5_3, 0x18c0), | 275 | INTC_VECT(IIC5_2, 0x18a0), INTC_VECT(IIC5_3, 0x18c0), |
280 | INTC_VECT(IIC6_0, 0x18e0), INTC_VECT(IIC6_1, 0x1900), | 276 | INTC_VECT(IIC6_0, 0x18e0), INTC_VECT(IIC6_1, 0x1900), |
281 | INTC_VECT(IIC6_2, 0x1920), INTC_VECT(IIC6_3, 0x1980), | 277 | INTC_VECT(IIC6_2, 0x1920), |
278 | INTC_VECT(ONFICTL, 0x1960), | ||
279 | INTC_VECT(IIC6_3, 0x1980), | ||
282 | INTC_VECT(IIC7_0, 0x19a0), INTC_VECT(IIC7_1, 0x1a00), | 280 | INTC_VECT(IIC7_0, 0x19a0), INTC_VECT(IIC7_1, 0x1a00), |
283 | INTC_VECT(IIC7_2, 0x1a20), INTC_VECT(IIC7_3, 0x1a40), | 281 | INTC_VECT(IIC7_2, 0x1a20), INTC_VECT(IIC7_3, 0x1a40), |
284 | INTC_VECT(IIC8_0, 0x1a60), INTC_VECT(IIC8_1, 0x1a80), | 282 | INTC_VECT(IIC8_0, 0x1a60), INTC_VECT(IIC8_1, 0x1a80), |
285 | INTC_VECT(IIC8_2, 0x1aa0), INTC_VECT(IIC8_3, 0x1b40), | 283 | INTC_VECT(IIC8_2, 0x1aa0), INTC_VECT(IIC8_3, 0x1b40), |
286 | INTC_VECT(IIC9_0, 0x1b60), INTC_VECT(IIC9_1, 0x1b80), | 284 | INTC_VECT(IIC9_0, 0x1b60), INTC_VECT(IIC9_1, 0x1b80), |
287 | INTC_VECT(IIC9_2, 0x1c00), INTC_VECT(IIC9_3, 0x1c20), | 285 | INTC_VECT(IIC9_2, 0x1c00), INTC_VECT(IIC9_3, 0x1c20), |
288 | INTC_VECT(PCIINTA, 0x1ce0), | 286 | INTC_VECT(MMC1, 0x1c60), INTC_VECT(MMC2, 0x1c80), |
289 | INTC_VECT(PCIE, 0x1e00), | 287 | INTC_VECT(ECCU, 0x1cc0), |
290 | INTC_VECT(SGPIO, 0x1f80), | 288 | INTC_VECT(PCIC, 0x1ce0), |
291 | INTC_VECT(SGPIO, 0x1fa0), | 289 | INTC_VECT(G200, 0x1d00), |
290 | INTC_VECT(RSPI, 0x1d80), INTC_VECT(RSPI, 0x1da0), | ||
291 | INTC_VECT(RSPI, 0x1dc0), INTC_VECT(RSPI, 0x1de0), | ||
292 | INTC_VECT(PECI3, 0x1ec0), INTC_VECT(PECI4, 0x1ee0), | ||
293 | INTC_VECT(PECI5, 0x1f00), | ||
294 | INTC_VECT(SGPIO, 0x1f80), INTC_VECT(SGPIO, 0x1fa0), | ||
295 | INTC_VECT(SGPIO, 0x1fc0), | ||
296 | INTC_VECT(DMINT12, 0x2400), INTC_VECT(DMINT13, 0x2420), | ||
297 | INTC_VECT(DMINT14, 0x2440), INTC_VECT(DMINT15, 0x2460), | ||
298 | INTC_VECT(DMINT16, 0x2480), INTC_VECT(DMINT17, 0x24e0), | ||
299 | INTC_VECT(DMINT18, 0x2500), INTC_VECT(DMINT19, 0x2520), | ||
300 | INTC_VECT(DMINT20, 0x2540), INTC_VECT(DMINT21, 0x2560), | ||
301 | INTC_VECT(DMINT22, 0x2580), INTC_VECT(DMINT23, 0x2600), | ||
302 | INTC_VECT(DDRECC, 0x2620), | ||
303 | INTC_VECT(TSIP, 0x2640), | ||
304 | INTC_VECT(PCIE_BRIDGE, 0x27c0), | ||
305 | INTC_VECT(WDT0B, 0x2800), INTC_VECT(WDT1B, 0x2820), | ||
306 | INTC_VECT(WDT2B, 0x2840), INTC_VECT(WDT3B, 0x2860), | ||
307 | INTC_VECT(WDT4B, 0x2880), INTC_VECT(WDT5B, 0x28a0), | ||
308 | INTC_VECT(WDT6B, 0x28c0), INTC_VECT(WDT7B, 0x28e0), | ||
309 | INTC_VECT(WDT8B, 0x2900), | ||
310 | INTC_VECT(GETHER0, 0x2960), INTC_VECT(GETHER1, 0x2980), | ||
311 | INTC_VECT(GETHER2, 0x29a0), | ||
312 | INTC_VECT(PBIA, 0x2a00), INTC_VECT(PBIB, 0x2a20), | ||
313 | INTC_VECT(PBIC, 0x2a40), | ||
314 | INTC_VECT(DMAE2, 0x2a60), INTC_VECT(DMAE3, 0x2a80), | ||
315 | INTC_VECT(SERMUX2, 0x2aa0), INTC_VECT(SERMUX3, 0x2b40), | ||
316 | INTC_VECT(LPC5, 0x2b60), INTC_VECT(LPC6, 0x2b80), | ||
317 | INTC_VECT(LPC7, 0x2c00), INTC_VECT(LPC8, 0x2c20), | ||
292 | }; | 318 | }; |
293 | 319 | ||
294 | static struct intc_group groups[] __initdata = { | 320 | static struct intc_group groups[] __initdata = { |
@@ -312,31 +338,45 @@ static struct intc_mask_reg mask_registers[] __initdata = { | |||
312 | 338 | ||
313 | { 0xffd40038, 0xffd4003c, 32, /* INT2MSKR / INT2MSKCR */ | 339 | { 0xffd40038, 0xffd4003c, 32, /* INT2MSKR / INT2MSKCR */ |
314 | { 0, 0, 0, 0, 0, 0, 0, 0, | 340 | { 0, 0, 0, 0, 0, 0, 0, 0, |
315 | 0, DMAC1_8, 0, PECI0I, LPC, FRT, WDT1, TMR45, | 341 | 0, DMAC8_11, 0, PECI0, LPC, FRT, 0, TMR45, |
316 | TMR23, TMR01, 0, 0, 0, 0, 0, DMAC0, | 342 | TMR23, TMR01, 0, 0, 0, 0, 0, DMAC0_5, |
317 | HUDI, 0, WDT0, SCIF3, SCIF2, SDHI, TMU345, TMU012 | 343 | HUDI, 0, 0, SCIF3, SCIF2, SDHI, TMU345, TMU012 |
318 | } }, | 344 | } }, |
319 | 345 | ||
320 | { 0xffd400d0, 0xffd400d4, 32, /* INT2MSKR1 / INT2MSKCR1 */ | 346 | { 0xffd400d0, 0xffd400d4, 32, /* INT2MSKR1 / INT2MSKCR1 */ |
321 | { IRQ15, IRQ14, IRQ13, IRQ12, IRQ11, IRQ10, SCIF4, ETHERC, | 347 | { IRQ15, IRQ14, IRQ13, IRQ12, IRQ11, IRQ10, SCIF4, ETHERC, |
322 | IRQ9, IRQ8, SCIF1, SCIF0, USB0, 0, 0, USB1, | 348 | IRQ9, IRQ8, SCIF1, SCIF0, USB0, 0, 0, USB1, |
323 | ADC1, 0, DMAC1_6, ADC0, SPI0, SIM, PECI2I, PECI1I, | 349 | ADC1, 0, DMAC6_7, ADC0, SPI0, SIM, PECI2, PECI1, |
324 | ARC4, 0, SPI1, JMC, 0, 0, 0, DVC | 350 | ARC4, 0, SPI1, JMC, 0, 0, 0, DVC |
325 | } }, | 351 | } }, |
326 | 352 | ||
327 | { 0xffd10038, 0xffd1003c, 32, /* INT2MSKR2 / INT2MSKCR2 */ | 353 | { 0xffd10038, 0xffd1003c, 32, /* INT2MSKR2 / INT2MSKCR2 */ |
328 | { IIC4_1, IIC4_2, IIC5_0, 0, 0, 0, SGPIO, 0, | 354 | { IIC4_1, IIC4_2, IIC5_0, ONFICTL, 0, 0, SGPIO, 0, |
329 | 0, 0, 0, IIC9_2, IIC8_2, IIC8_1, IIC8_0, IIC7_3, | 355 | 0, G200, 0, IIC9_2, IIC8_2, IIC8_1, IIC8_0, IIC7_3, |
330 | IIC7_2, IIC7_1, IIC6_3, IIC0_0, IIC0_1, IIC0_2, IIC0_3, IIC3_1, | 356 | IIC7_2, IIC7_1, IIC6_3, IIC0_0, IIC0_1, IIC0_2, IIC0_3, IIC3_1, |
331 | IIC2_3, 0, IIC2_1, IIC9_1, IIC3_3, IIC1_0, PCIE, IIC2_2 | 357 | IIC2_3, 0, IIC2_1, IIC9_1, IIC3_3, IIC1_0, 0, IIC2_2 |
332 | } }, | 358 | } }, |
333 | 359 | ||
334 | { 0xffd100d0, 0xff1400d4, 32, /* INT2MSKR3 / INT2MSKCR4 */ | 360 | { 0xffd100d0, 0xffd100d4, 32, /* INT2MSKR3 / INT2MSKCR3 */ |
335 | { 0, IIC6_1, IIC6_0, IIC5_1, IIC3_2, IIC2_0, 0, 0, | 361 | { MMC1, IIC6_1, IIC6_0, IIC5_1, IIC3_2, IIC2_0, PECI5, MMC2, |
336 | IIC1_3, IIC1_2, IIC9_0, IIC8_3, IIC4_3, IIC7_0, 0, IIC6_2, | 362 | IIC1_3, IIC1_2, IIC9_0, IIC8_3, IIC4_3, IIC7_0, 0, IIC6_2, |
337 | PCIINTA, 0, IIC4_0, 0, 0, 0, 0, IIC9_3, | 363 | PCIC, 0, IIC4_0, 0, ECCU, RSPI, 0, IIC9_3, |
338 | IIC3_0, 0, IIC5_3, IIC5_2, 0, 0, 0, IIC1_1 | 364 | IIC3_0, 0, IIC5_3, IIC5_2, 0, 0, 0, IIC1_1 |
339 | } }, | 365 | } }, |
366 | |||
367 | { 0xffd20038, 0xffd2003c, 32, /* INT2MSKR4 / INT2MSKCR4 */ | ||
368 | { WDT0B, WDT1B, WDT3B, GETHER0, 0, 0, 0, 0, | ||
369 | 0, 0, 0, LPC7, SERMUX2, DMAE3, DMAE2, PBIC, | ||
370 | PBIB, PBIA, GETHER1, DMINT12, DMINT13, DMINT14, DMINT15, TSIP, | ||
371 | DMINT23, 0, DMINT21, LPC6, 0, DMINT16, 0, DMINT22 | ||
372 | } }, | ||
373 | |||
374 | { 0xffd200d0, 0xffd200d4, 32, /* INT2MSKR5 / INT2MSKCR5 */ | ||
375 | { 0, WDT8B, WDT7B, WDT4B, 0, DMINT20, 0, 0, | ||
376 | DMINT19, DMINT18, LPC5, SERMUX3, WDT2B, GETHER2, 0, 0, | ||
377 | 0, 0, PCIE_BRIDGE, 0, 0, 0, 0, LPC8, | ||
378 | DDRECC, 0, WDT6B, WDT5B, 0, 0, 0, DMINT17 | ||
379 | } }, | ||
340 | }; | 380 | }; |
341 | 381 | ||
342 | #define INTPRI 0xffd00010 | 382 | #define INTPRI 0xffd00010 |
@@ -372,6 +412,22 @@ static struct intc_mask_reg mask_registers[] __initdata = { | |||
372 | #define INT2PRI29 0xffd100b4 | 412 | #define INT2PRI29 0xffd100b4 |
373 | #define INT2PRI30 0xffd100b8 | 413 | #define INT2PRI30 0xffd100b8 |
374 | #define INT2PRI31 0xffd100bc | 414 | #define INT2PRI31 0xffd100bc |
415 | #define INT2PRI32 0xffd20000 | ||
416 | #define INT2PRI33 0xffd20004 | ||
417 | #define INT2PRI34 0xffd20008 | ||
418 | #define INT2PRI35 0xffd2000c | ||
419 | #define INT2PRI36 0xffd20010 | ||
420 | #define INT2PRI37 0xffd20014 | ||
421 | #define INT2PRI38 0xffd20018 | ||
422 | #define INT2PRI39 0xffd2001c | ||
423 | #define INT2PRI40 0xffd200a0 | ||
424 | #define INT2PRI41 0xffd200a4 | ||
425 | #define INT2PRI42 0xffd200a8 | ||
426 | #define INT2PRI43 0xffd200ac | ||
427 | #define INT2PRI44 0xffd200b0 | ||
428 | #define INT2PRI45 0xffd200b4 | ||
429 | #define INT2PRI46 0xffd200b8 | ||
430 | #define INT2PRI47 0xffd200bc | ||
375 | 431 | ||
376 | static struct intc_prio_reg prio_registers[] __initdata = { | 432 | static struct intc_prio_reg prio_registers[] __initdata = { |
377 | { INTPRI, 0, 32, 4, { IRQ0, IRQ1, IRQ2, IRQ3, | 433 | { INTPRI, 0, 32, 4, { IRQ0, IRQ1, IRQ2, IRQ3, |
@@ -379,39 +435,61 @@ static struct intc_prio_reg prio_registers[] __initdata = { | |||
379 | 435 | ||
380 | { INT2PRI0, 0, 32, 8, { TMU0, TMU1, TMU2, TMU2_TICPI } }, | 436 | { INT2PRI0, 0, 32, 8, { TMU0, TMU1, TMU2, TMU2_TICPI } }, |
381 | { INT2PRI1, 0, 32, 8, { TMU3, TMU4, TMU5, SDHI } }, | 437 | { INT2PRI1, 0, 32, 8, { TMU3, TMU4, TMU5, SDHI } }, |
382 | { INT2PRI2, 0, 32, 8, { SCIF2, SCIF3, WDT0, IRQ8 } }, | 438 | { INT2PRI2, 0, 32, 8, { SCIF2, SCIF3, 0, IRQ8 } }, |
383 | { INT2PRI3, 0, 32, 8, { HUDI, DMAC0, ADC0, IRQ9 } }, | 439 | { INT2PRI3, 0, 32, 8, { HUDI, DMAC0_5, ADC0, IRQ9 } }, |
384 | { INT2PRI4, 0, 32, 8, { IRQ10, 0, TMR01, TMR23 } }, | 440 | { INT2PRI4, 0, 32, 8, { IRQ10, 0, TMR01, TMR23 } }, |
385 | { INT2PRI5, 0, 32, 8, { TMR45, WDT1, FRT, LPC } }, | 441 | { INT2PRI5, 0, 32, 8, { TMR45, 0, FRT, LPC } }, |
386 | { INT2PRI6, 0, 32, 8, { PECI0I, ETHERC, DMAC1_8, 0 } }, | 442 | { INT2PRI6, 0, 32, 8, { PECI0, ETHERC, DMAC8_11, 0 } }, |
387 | { INT2PRI7, 0, 32, 8, { SCIF4, 0, IRQ11, IRQ12 } }, | 443 | { INT2PRI7, 0, 32, 8, { SCIF4, 0, IRQ11, IRQ12 } }, |
388 | { INT2PRI8, 0, 32, 8, { 0, 0, 0, DVC } }, | 444 | { INT2PRI8, 0, 32, 8, { 0, 0, 0, DVC } }, |
389 | { INT2PRI9, 0, 32, 8, { ARC4, 0, SPI1, JMC } }, | 445 | { INT2PRI9, 0, 32, 8, { ARC4, 0, SPI1, JMC } }, |
390 | { INT2PRI10, 0, 32, 8, { SPI0, SIM, PECI2I, PECI1I } }, | 446 | { INT2PRI10, 0, 32, 8, { SPI0, SIM, PECI2, PECI1 } }, |
391 | { INT2PRI11, 0, 32, 8, { ADC1, IRQ13, DMAC1_6, IRQ14 } }, | 447 | { INT2PRI11, 0, 32, 8, { ADC1, IRQ13, DMAC6_7, IRQ14 } }, |
392 | { INT2PRI12, 0, 32, 8, { USB0, 0, IRQ15, USB1 } }, | 448 | { INT2PRI12, 0, 32, 8, { USB0, 0, IRQ15, USB1 } }, |
393 | { INT2PRI13, 0, 32, 8, { 0, 0, SCIF1, SCIF0 } }, | 449 | { INT2PRI13, 0, 32, 8, { 0, 0, SCIF1, SCIF0 } }, |
394 | 450 | ||
395 | { INT2PRI16, 0, 32, 8, { IIC2_2, 0, 0, 0 } }, | 451 | { INT2PRI16, 0, 32, 8, { IIC2_2, 0, 0, 0 } }, |
396 | { INT2PRI17, 0, 32, 8, { PCIE, 0, 0, IIC1_0 } }, | 452 | { INT2PRI17, 0, 32, 8, { 0, 0, 0, IIC1_0 } }, |
397 | { INT2PRI18, 0, 32, 8, { IIC3_3, IIC9_1, IIC2_1, IIC1_2 } }, | 453 | { INT2PRI18, 0, 32, 8, { IIC3_3, IIC9_1, IIC2_1, IIC1_2 } }, |
398 | { INT2PRI19, 0, 32, 8, { IIC2_3, IIC3_1, 0, IIC1_3 } }, | 454 | { INT2PRI19, 0, 32, 8, { IIC2_3, IIC3_1, 0, IIC1_3 } }, |
399 | { INT2PRI20, 0, 32, 8, { IIC2_0, IIC6_3, IIC7_1, IIC7_2 } }, | 455 | { INT2PRI20, 0, 32, 8, { IIC2_0, IIC6_3, IIC7_1, IIC7_2 } }, |
400 | { INT2PRI21, 0, 32, 8, { IIC7_3, IIC8_0, IIC8_1, IIC8_2 } }, | 456 | { INT2PRI21, 0, 32, 8, { IIC7_3, IIC8_0, IIC8_1, IIC8_2 } }, |
401 | { INT2PRI22, 0, 32, 8, { IIC9_2, 0, 0, 0 } }, | 457 | { INT2PRI22, 0, 32, 8, { IIC9_2, MMC2, G200, 0 } }, |
402 | { INT2PRI23, 0, 32, 8, { 0, SGPIO, IIC3_2, IIC5_1 } }, | 458 | { INT2PRI23, 0, 32, 8, { PECI5, SGPIO, IIC3_2, IIC5_1 } }, |
403 | { INT2PRI24, 0, 32, 8, { 0, 0, 0, IIC1_1 } }, | 459 | { INT2PRI24, 0, 32, 8, { PECI4, PECI3, 0, IIC1_1 } }, |
404 | { INT2PRI25, 0, 32, 8, { IIC3_0, 0, IIC5_3, IIC5_2 } }, | 460 | { INT2PRI25, 0, 32, 8, { IIC3_0, 0, IIC5_3, IIC5_2 } }, |
405 | { INT2PRI26, 0, 32, 8, { 0, 0, 0, IIC9_3 } }, | 461 | { INT2PRI26, 0, 32, 8, { ECCU, RSPI, 0, IIC9_3 } }, |
406 | { INT2PRI27, 0, 32, 8, { PCIINTA, IIC6_0, IIC4_0, IIC6_1 } }, | 462 | { INT2PRI27, 0, 32, 8, { PCIC, IIC6_0, IIC4_0, IIC6_1 } }, |
407 | { INT2PRI28, 0, 32, 8, { IIC4_3, IIC7_0, 0, IIC6_2 } }, | 463 | { INT2PRI28, 0, 32, 8, { IIC4_3, IIC7_0, MMC1, IIC6_2 } }, |
408 | { INT2PRI29, 0, 32, 8, { 0, 0, IIC9_0, IIC8_3 } }, | 464 | { INT2PRI29, 0, 32, 8, { 0, 0, IIC9_0, IIC8_3 } }, |
409 | { INT2PRI30, 0, 32, 8, { IIC4_1, IIC4_2, IIC5_0, 0 } }, | 465 | { INT2PRI30, 0, 32, 8, { IIC4_1, IIC4_2, IIC5_0, ONFICTL } }, |
410 | { INT2PRI31, 0, 32, 8, { IIC0_0, IIC0_1, IIC0_2, IIC0_3 } }, | 466 | { INT2PRI31, 0, 32, 8, { IIC0_0, IIC0_1, IIC0_2, IIC0_3 } }, |
467 | { INT2PRI32, 0, 32, 8, { DMINT22, 0, 0, 0 } }, | ||
468 | { INT2PRI33, 0, 32, 8, { 0, 0, 0, DMINT16 } }, | ||
469 | { INT2PRI34, 0, 32, 8, { 0, LPC6, DMINT21, DMINT18 } }, | ||
470 | { INT2PRI35, 0, 32, 8, { DMINT23, TSIP, 0, DMINT19 } }, | ||
471 | { INT2PRI36, 0, 32, 8, { DMINT20, GETHER1, PBIA, PBIB } }, | ||
472 | { INT2PRI37, 0, 32, 8, { PBIC, DMAE2, DMAE3, SERMUX2 } }, | ||
473 | { INT2PRI38, 0, 32, 8, { LPC7, 0, 0, 0 } }, | ||
474 | { INT2PRI39, 0, 32, 8, { 0, 0, 0, WDT4B } }, | ||
475 | { INT2PRI40, 0, 32, 8, { 0, 0, 0, DMINT17 } }, | ||
476 | { INT2PRI41, 0, 32, 8, { DDRECC, 0, WDT6B, WDT5B } }, | ||
477 | { INT2PRI42, 0, 32, 8, { 0, 0, 0, LPC8 } }, | ||
478 | { INT2PRI43, 0, 32, 8, { 0, WDT7B, PCIE_BRIDGE, WDT8B } }, | ||
479 | { INT2PRI44, 0, 32, 8, { WDT2B, GETHER2, 0, 0 } }, | ||
480 | { INT2PRI45, 0, 32, 8, { 0, 0, LPC5, SERMUX3 } }, | ||
481 | { INT2PRI46, 0, 32, 8, { WDT0B, WDT1B, WDT3B, GETHER0 } }, | ||
482 | { INT2PRI47, 0, 32, 8, { DMINT12, DMINT13, DMINT14, DMINT15 } }, | ||
483 | }; | ||
484 | |||
485 | static struct intc_sense_reg sense_registers_irq8to15[] __initdata = { | ||
486 | { 0xffd100f8, 32, 2, /* ICR2 */ { IRQ15, IRQ14, IRQ13, IRQ12, | ||
487 | IRQ11, IRQ10, IRQ9, IRQ8 } }, | ||
411 | }; | 488 | }; |
412 | 489 | ||
413 | static DECLARE_INTC_DESC(intc_desc, "sh7757", vectors, groups, | 490 | static DECLARE_INTC_DESC(intc_desc, "sh7757", vectors, groups, |
414 | mask_registers, prio_registers, NULL); | 491 | mask_registers, prio_registers, |
492 | sense_registers_irq8to15); | ||
415 | 493 | ||
416 | /* Support for external interrupt pins in IRQ mode */ | 494 | /* Support for external interrupt pins in IRQ mode */ |
417 | static struct intc_vect vectors_irq0123[] __initdata = { | 495 | static struct intc_vect vectors_irq0123[] __initdata = { |