diff options
author | Magnus Damm <damm@igel.co.jp> | 2007-08-01 03:50:42 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-20 22:57:47 -0400 |
commit | 137b53b71cd421e0f59f7c4a3767c0fa9e49260a (patch) | |
tree | ed8af93b7d52f449be4898d06858643145f085b2 | |
parent | ac38e4d33d8da3c3c402d2b4858d107273287f43 (diff) |
sh: intc - fix IRQ4 and IRQ5 typo on sh3
The intc tables for sh3 currently contain a typo where the bit
fields in IPRD are mixed up for IRQ4 and IRQ5. This patch makes
sure the correct bit fields are used - all according to the
datasheets.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7705.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh770x.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index fb5802543e9a..6fc68e77102f 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c | |||
@@ -75,7 +75,7 @@ static struct intc_prio_reg prio_registers[] = { | |||
75 | { 0xfffffee2, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, | 75 | { 0xfffffee2, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, |
76 | { 0xfffffee4, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } }, | 76 | { 0xfffffee4, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } }, |
77 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, | 77 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, |
78 | { 0xa4000018, 16, 4, /* IPRD */ { PINT07, PINT815, IRQ4, IRQ5 } }, | 78 | { 0xa4000018, 16, 4, /* IPRD */ { PINT07, PINT815, IRQ5, IRQ4 } }, |
79 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC, SCIF0, SCIF2, ADC_ADI } }, | 79 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC, SCIF0, SCIF2, ADC_ADI } }, |
80 | { 0xa4080000, 16, 4, /* IPRF */ { 0, 0, USB } }, | 80 | { 0xa4080000, 16, 4, /* IPRF */ { 0, 0, USB } }, |
81 | { 0xa4080002, 16, 4, /* IPRG */ { TPU0, TPU1 } }, | 81 | { 0xa4080002, 16, 4, /* IPRG */ { TPU0, TPU1 } }, |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c index 43f8199bb4c1..97570c7fd780 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c | |||
@@ -95,7 +95,7 @@ static struct intc_prio_reg prio_registers[] = { | |||
95 | defined(CONFIG_CPU_SUBTYPE_SH7707) || \ | 95 | defined(CONFIG_CPU_SUBTYPE_SH7707) || \ |
96 | defined(CONFIG_CPU_SUBTYPE_SH7709) | 96 | defined(CONFIG_CPU_SUBTYPE_SH7709) |
97 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, | 97 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, |
98 | { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ4, IRQ5 } }, | 98 | { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ5, IRQ4 } }, |
99 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC, 0, SCIF2, ADC_ADI } }, | 99 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC, 0, SCIF2, ADC_ADI } }, |
100 | #endif | 100 | #endif |
101 | #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \ | 101 | #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \ |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index 8b065aa5f507..07f26ab75d97 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -88,7 +88,7 @@ static struct intc_prio_reg prio_registers[] = { | |||
88 | { 0xfffffee2, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, | 88 | { 0xfffffee2, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, |
89 | { 0xfffffee4, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } }, | 89 | { 0xfffffee4, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } }, |
90 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, | 90 | { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, |
91 | { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ4, IRQ5 } }, | 91 | { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ5, IRQ4 } }, |
92 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC1, SCIF0, SCIF1 } }, | 92 | { 0xa400001a, 16, 4, /* IPRE */ { DMAC1, SCIF0, SCIF1 } }, |
93 | { 0xa4080000, 16, 4, /* IPRF */ { 0, DMAC2 } }, | 93 | { 0xa4080000, 16, 4, /* IPRF */ { 0, DMAC2 } }, |
94 | #ifdef CONFIG_CPU_SUBTYPE_SH7710 | 94 | #ifdef CONFIG_CPU_SUBTYPE_SH7710 |