diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-03-06 04:02:33 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-06 04:02:33 -0500 |
commit | e45efe68d11e9f3c836b019a32b879a26a2b9b33 (patch) | |
tree | 91f9462d667a1cf38d9f57d7d83253e476d2e8f6 /arch/sh/kernel/cpu/sh2a/setup-sh7203.c | |
parent | bb943a286c6f2993a737cc44c170d8b26e72c8ff (diff) |
sh: multiple vectors per irq - sh7263.
Convert over the SH7263 IRQ groups as well.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/setup-sh7203.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c index 18d127ca0e6..820dfb2e865 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | |||
@@ -34,15 +34,11 @@ enum { | |||
34 | SSI0_SSII, SSI1_SSII, SSI2_SSII, SSI3_SSII, | 34 | SSI0_SSII, SSI1_SSII, SSI2_SSII, SSI3_SSII, |
35 | 35 | ||
36 | /* ROM-DEC, SDHI, SRC, and IEB are SH7263 specific */ | 36 | /* ROM-DEC, SDHI, SRC, and IEB are SH7263 specific */ |
37 | ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG, ROMDEC_ISEC, ROMDEC_IBUF, | 37 | ROMDEC, FLCTL, SDHI, RTC, RCAN0, RCAN1, |
38 | ROMDEC_IREADY, | 38 | SRC, IEBI, |
39 | |||
40 | FLCTL, SDHI3, SDHI0, SDHI1, RTC, RCAN0, RCAN1, | ||
41 | |||
42 | SRC_OVF, SRC_ODFI, SRC_IDEI, IEBI, | ||
43 | 39 | ||
44 | /* interrupt groups */ | 40 | /* interrupt groups */ |
45 | PINT, ROMDEC, SDHI, SRC | 41 | PINT, |
46 | }; | 42 | }; |
47 | 43 | ||
48 | static struct intc_vect vectors[] __initdata = { | 44 | static struct intc_vect vectors[] __initdata = { |
@@ -119,14 +115,15 @@ static struct intc_vect vectors[] __initdata = { | |||
119 | 115 | ||
120 | /* SH7263-specific trash */ | 116 | /* SH7263-specific trash */ |
121 | #ifdef CONFIG_CPU_SUBTYPE_SH7263 | 117 | #ifdef CONFIG_CPU_SUBTYPE_SH7263 |
122 | INTC_IRQ(ROMDEC_ISY, 218), INTC_IRQ(ROMDEC_IERR, 219), | 118 | INTC_IRQ(ROMDEC, 218), INTC_IRQ(ROMDEC, 219), |
123 | INTC_IRQ(ROMDEC_IARG, 220), INTC_IRQ(ROMDEC_ISEC, 221), | 119 | INTC_IRQ(ROMDEC, 220), INTC_IRQ(ROMDEC, 221), |
124 | INTC_IRQ(ROMDEC_IBUF, 222), INTC_IRQ(ROMDEC_IREADY, 223), | 120 | INTC_IRQ(ROMDEC, 222), INTC_IRQ(ROMDEC, 223), |
125 | 121 | ||
126 | INTC_IRQ(SDHI3, 228), INTC_IRQ(SDHI0, 229), INTC_IRQ(SDHI1, 230), | 122 | INTC_IRQ(SDHI, 228), INTC_IRQ(SDHI, 229), |
123 | INTC_IRQ(SDHI, 230), | ||
127 | 124 | ||
128 | INTC_IRQ(SRC_OVF, 244), INTC_IRQ(SRC_ODFI, 245), | 125 | INTC_IRQ(SRC, 244), INTC_IRQ(SRC, 245), |
129 | INTC_IRQ(SRC_IDEI, 246), | 126 | INTC_IRQ(SRC, 246), |
130 | 127 | ||
131 | INTC_IRQ(IEBI, 247), | 128 | INTC_IRQ(IEBI, 247), |
132 | #endif | 129 | #endif |
@@ -135,12 +132,6 @@ static struct intc_vect vectors[] __initdata = { | |||
135 | static struct intc_group groups[] __initdata = { | 132 | static struct intc_group groups[] __initdata = { |
136 | INTC_GROUP(PINT, PINT0, PINT1, PINT2, PINT3, | 133 | INTC_GROUP(PINT, PINT0, PINT1, PINT2, PINT3, |
137 | PINT4, PINT5, PINT6, PINT7), | 134 | PINT4, PINT5, PINT6, PINT7), |
138 | #ifdef CONFIG_CPU_SUBTYPE_SH7263 | ||
139 | INTC_GROUP(ROMDEC, ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG, | ||
140 | ROMDEC_ISEC, ROMDEC_IBUF, ROMDEC_IREADY), | ||
141 | INTC_GROUP(SDHI, SDHI3, SDHI0, SDHI1), | ||
142 | INTC_GROUP(SRC, SRC_OVF, SRC_ODFI, SRC_IDEI), | ||
143 | #endif | ||
144 | }; | 135 | }; |
145 | 136 | ||
146 | static struct intc_prio_reg prio_registers[] __initdata = { | 137 | static struct intc_prio_reg prio_registers[] __initdata = { |