| From koba@kmckk.co.jp Mon Sep 24 22:10:02 2012 |
| From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Date: Tue, 25 Sep 2012 14:07:54 +0900 |
| Subject: [PATCH 18/21] ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict |
| To: greg@kroah.com |
| Cc: ltsi-dev@lists.linuxfoundation.org, horms@verge.net.au, damm@opensource.se, kuninori.morimoto.gx@renesas.com, "Rafael J. Wysocki" <rjw@sisk.pl>, Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| Message-ID: <1348549677-1458-19-git-send-email-koba@kmckk.co.jp> |
| |
| |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| |
| 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> |
| (cherry picked from commit 4da773193414788b52ae14bc246543390faca5ce) |
| |
| Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> |
| --- |
| arch/arm/mach-shmobile/include/mach/sh73a0.h | 34 +++++++++++++++++++++++--- |
| 1 file 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 ac75857..398e2c1 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h |
| +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h |
| @@ -518,8 +518,36 @@ enum { |
| SHDMA_SLAVE_MMCIF_RX, |
| }; |
| |
| -/* PINT interrupts are located at Linux IRQ 800 and up */ |
| -#define SH73A0_PINT0_IRQ(irq) ((irq) + 800) |
| -#define SH73A0_PINT1_IRQ(irq) ((irq) + 832) |
| +/* |
| + * SH73A0 IRQ LOCATION TABLE |
| + * |
| + * 416 ----------------------------------------- |
| + * IRQ0-IRQ15 |
| + * 431 ----------------------------------------- |
| + * ... |
| + * 448 ----------------------------------------- |
| + * sh73a0-intcs |
| + * sh73a0-intca-irq-pins |
| + * 680 ----------------------------------------- |
| + * ... |
| + * 700 ----------------------------------------- |
| + * sh73a0-pint0 |
| + * 731 ----------------------------------------- |
| + * 732 ----------------------------------------- |
| + * sh73a0-pint1 |
| + * 739 ----------------------------------------- |
| + * ... |
| + * 800 ----------------------------------------- |
| + * IRQ16-IRQ31 |
| + * 815 ----------------------------------------- |
| + * ... |
| + * 928 ----------------------------------------- |
| + * sh73a0-intca-irq-pins |
| + * 943 ----------------------------------------- |
| + */ |
| + |
| +/* PINT interrupts are located at Linux IRQ 700 and up */ |
| +#define SH73A0_PINT0_IRQ(irq) ((irq) + 700) |
| +#define SH73A0_PINT1_IRQ(irq) ((irq) + 732) |
| |
| #endif /* __ASM_SH73A0_H__ */ |
| -- |
| 1.7.9.5 |
| |
