diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-05-16 18:25:14 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-16 18:25:14 -0400 |
| commit | 4da773193414788b52ae14bc246543390faca5ce (patch) | |
| tree | 3428db5c80c6154994d6750d05296dd9abec8951 /arch/arm/mach-shmobile | |
| parent | c8241085e8606a14ef48e6d99556133c48aaddaf (diff) | |
ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
Current IRQ16-IRQ31 irq number are located around 800 from
1ee8299a9ec1ce5137a044c7768293007b9a3267
(ARM: mach-shmobile: Use 0x3400 as INTCS vector offset)
But, the PINT0/1 IRQ number are also located around 800 from
0df1a838d678fc6ab49f983a19e905f6a42297a0
(ARM: mach-shmobile: sh73a0 PINT IRQ base fix)
This patch relocates PINT0/1 IRQ number to around 700 where is not used,
and adds current IRQ location table in comment area.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh73a0.h | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h index cad57578ceed..9b3598e4f105 100644 --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h | |||
| @@ -515,8 +515,36 @@ enum { | |||
| 515 | SHDMA_SLAVE_MMCIF_RX, | 515 | SHDMA_SLAVE_MMCIF_RX, |
| 516 | }; | 516 | }; |
| 517 | 517 | ||
| 518 | /* PINT interrupts are located at Linux IRQ 800 and up */ | 518 | /* |
| 519 | #define SH73A0_PINT0_IRQ(irq) ((irq) + 800) | 519 | * SH73A0 IRQ LOCATION TABLE |
| 520 | #define SH73A0_PINT1_IRQ(irq) ((irq) + 832) | 520 | * |
| 521 | * 416 ----------------------------------------- | ||
| 522 | * IRQ0-IRQ15 | ||
| 523 | * 431 ----------------------------------------- | ||
| 524 | * ... | ||
| 525 | * 448 ----------------------------------------- | ||
| 526 | * sh73a0-intcs | ||
| 527 | * sh73a0-intca-irq-pins | ||
| 528 | * 680 ----------------------------------------- | ||
| 529 | * ... | ||
| 530 | * 700 ----------------------------------------- | ||
| 531 | * sh73a0-pint0 | ||
| 532 | * 731 ----------------------------------------- | ||
| 533 | * 732 ----------------------------------------- | ||
| 534 | * sh73a0-pint1 | ||
| 535 | * 739 ----------------------------------------- | ||
| 536 | * ... | ||
| 537 | * 800 ----------------------------------------- | ||
| 538 | * IRQ16-IRQ31 | ||
| 539 | * 815 ----------------------------------------- | ||
| 540 | * ... | ||
| 541 | * 928 ----------------------------------------- | ||
| 542 | * sh73a0-intca-irq-pins | ||
| 543 | * 943 ----------------------------------------- | ||
| 544 | */ | ||
| 545 | |||
| 546 | /* PINT interrupts are located at Linux IRQ 700 and up */ | ||
| 547 | #define SH73A0_PINT0_IRQ(irq) ((irq) + 700) | ||
| 548 | #define SH73A0_PINT1_IRQ(irq) ((irq) + 732) | ||
| 521 | 549 | ||
| 522 | #endif /* __ASM_SH73A0_H__ */ | 550 | #endif /* __ASM_SH73A0_H__ */ |