tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: multiple vectors per irq - sh7720.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Paul Mundt edab56f4 56d604de

+23 -45
+23 -45
arch/sh/kernel/cpu/sh3/setup-sh7720.c
··· 2 2 * SH7720 Setup 3 3 * 4 4 * Copyright (C) 2007 Markus Brunner, Mark Jonas 5 + * Copyright (C) 2009 Paul Mundt 5 6 * 6 7 * Based on arch/sh/kernel/cpu/sh4/setup-sh7750.c: 7 8 * ··· 27 26 .flags = IORESOURCE_IO, 28 27 }, 29 28 [1] = { 30 - /* Period IRQ */ 31 - .start = 21, 32 - .flags = IORESOURCE_IRQ, 33 - }, 34 - [2] = { 35 - /* Carry IRQ */ 36 - .start = 22, 37 - .flags = IORESOURCE_IRQ, 38 - }, 39 - [3] = { 40 - /* Alarm IRQ */ 29 + /* Shared Period/Carry/Alarm IRQ */ 41 30 .start = 20, 42 31 .flags = IORESOURCE_IRQ, 43 32 }, ··· 141 150 UNUSED = 0, 142 151 143 152 /* interrupt sources */ 144 - TMU0, TMU1, TMU2, RTC_ATI, RTC_PRI, RTC_CUI, 145 - WDT, REF_RCMI, SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND, 153 + TMU0, TMU1, TMU2, RTC, 154 + WDT, REF_RCMI, SIM, 146 155 IRQ0, IRQ1, IRQ2, IRQ3, 147 156 USBF_SPD, TMU_SUNI, IRQ5, IRQ4, 148 - DMAC1_DEI0, DMAC1_DEI1, DMAC1_DEI2, DMAC1_DEI3, LCDC, SSL, 149 - ADC, DMAC2_DEI4, DMAC2_DEI5, USBFI0, USBFI1, CMT, 157 + DMAC1, LCDC, SSL, 158 + ADC, DMAC2, USBFI, CMT, 150 159 SCIF0, SCIF1, 151 - PINT07, PINT815, TPU0, TPU1, TPU2, TPU3, IIC, 152 - SIOF0, SIOF1, MMCI0, MMCI1, MMCI2, MMCI3, PCC, 160 + PINT07, PINT815, TPU, IIC, 161 + SIOF0, SIOF1, MMC, PCC, 153 162 USBHI, AFEIF, 154 163 H_UDI, 155 - /* interrupt groups */ 156 - TMU, RTC, SIM, DMAC1, USBFI, DMAC2, USB, TPU, MMC, 157 164 }; 158 165 159 166 static struct intc_vect vectors[] __initdata = { 160 167 /* IRQ0->5 are handled in setup-sh3.c */ 161 168 INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420), 162 - INTC_VECT(TMU2, 0x440), INTC_VECT(RTC_ATI, 0x480), 163 - INTC_VECT(RTC_PRI, 0x4a0), INTC_VECT(RTC_CUI, 0x4c0), 164 - INTC_VECT(SIM_ERI, 0x4e0), INTC_VECT(SIM_RXI, 0x500), 165 - INTC_VECT(SIM_TXI, 0x520), INTC_VECT(SIM_TEND, 0x540), 169 + INTC_VECT(TMU2, 0x440), INTC_VECT(RTC, 0x480), 170 + INTC_VECT(RTC, 0x4a0), INTC_VECT(RTC, 0x4c0), 171 + INTC_VECT(SIM, 0x4e0), INTC_VECT(SIM, 0x500), 172 + INTC_VECT(SIM, 0x520), INTC_VECT(SIM, 0x540), 166 173 INTC_VECT(WDT, 0x560), INTC_VECT(REF_RCMI, 0x580), 167 174 /* H_UDI cannot be masked */ INTC_VECT(TMU_SUNI, 0x6c0), 168 - INTC_VECT(USBF_SPD, 0x6e0), INTC_VECT(DMAC1_DEI0, 0x800), 169 - INTC_VECT(DMAC1_DEI1, 0x820), INTC_VECT(DMAC1_DEI2, 0x840), 170 - INTC_VECT(DMAC1_DEI3, 0x860), INTC_VECT(LCDC, 0x900), 175 + INTC_VECT(USBF_SPD, 0x6e0), INTC_VECT(DMAC1, 0x800), 176 + INTC_VECT(DMAC1, 0x820), INTC_VECT(DMAC1, 0x840), 177 + INTC_VECT(DMAC1, 0x860), INTC_VECT(LCDC, 0x900), 171 178 #if defined(CONFIG_CPU_SUBTYPE_SH7720) 172 179 INTC_VECT(SSL, 0x980), 173 180 #endif 174 - INTC_VECT(USBFI0, 0xa20), INTC_VECT(USBFI1, 0xa40), 181 + INTC_VECT(USBFI, 0xa20), INTC_VECT(USBFI, 0xa40), 175 182 INTC_VECT(USBHI, 0xa60), 176 - INTC_VECT(DMAC2_DEI4, 0xb80), INTC_VECT(DMAC2_DEI5, 0xba0), 183 + INTC_VECT(DMAC2, 0xb80), INTC_VECT(DMAC2, 0xba0), 177 184 INTC_VECT(ADC, 0xbe0), INTC_VECT(SCIF0, 0xc00), 178 185 INTC_VECT(SCIF1, 0xc20), INTC_VECT(PINT07, 0xc80), 179 186 INTC_VECT(PINT815, 0xca0), INTC_VECT(SIOF0, 0xd00), 180 - INTC_VECT(SIOF1, 0xd20), INTC_VECT(TPU0, 0xd80), 181 - INTC_VECT(TPU1, 0xda0), INTC_VECT(TPU2, 0xdc0), 182 - INTC_VECT(TPU3, 0xde0), INTC_VECT(IIC, 0xe00), 183 - INTC_VECT(MMCI0, 0xe80), INTC_VECT(MMCI1, 0xea0), 184 - INTC_VECT(MMCI2, 0xec0), INTC_VECT(MMCI3, 0xee0), 187 + INTC_VECT(SIOF1, 0xd20), INTC_VECT(TPU, 0xd80), 188 + INTC_VECT(TPU, 0xda0), INTC_VECT(TPU, 0xdc0), 189 + INTC_VECT(TPU, 0xde0), INTC_VECT(IIC, 0xe00), 190 + INTC_VECT(MMC, 0xe80), INTC_VECT(MMC, 0xea0), 191 + INTC_VECT(MMC, 0xec0), INTC_VECT(MMC, 0xee0), 185 192 INTC_VECT(CMT, 0xf00), INTC_VECT(PCC, 0xf60), 186 193 INTC_VECT(AFEIF, 0xfe0), 187 - }; 188 - 189 - static struct intc_group groups[] __initdata = { 190 - INTC_GROUP(TMU, TMU0, TMU1, TMU2), 191 - INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), 192 - INTC_GROUP(SIM, SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND), 193 - INTC_GROUP(DMAC1, DMAC1_DEI0, DMAC1_DEI1, DMAC1_DEI2, DMAC1_DEI3), 194 - INTC_GROUP(USBFI, USBFI0, USBFI1), 195 - INTC_GROUP(DMAC2, DMAC2_DEI4, DMAC2_DEI5), 196 - INTC_GROUP(TPU, TPU0, TPU1, TPU2, TPU3), 197 - INTC_GROUP(MMC, MMCI0, MMCI1, MMCI2, MMCI3), 198 194 }; 199 195 200 196 static struct intc_prio_reg prio_registers[] __initdata = { ··· 197 219 { 0xA4080008UL, 0, 16, 4, /* IPRJ */ { 0, USBHI, 0, AFEIF } }, 198 220 }; 199 221 200 - static DECLARE_INTC_DESC(intc_desc, "sh7720", vectors, groups, 222 + static DECLARE_INTC_DESC(intc_desc, "sh7720", vectors, NULL, 201 223 NULL, prio_registers, NULL); 202 224 203 225 void __init plat_irq_setup(void)