Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d55eedd5 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: multiple vectors per irq - sh7201. 



Follow the conversions as per the other subtypes.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e45efe68

arch/sh/kernel/cpu/sh2a/setup-sh7201.c

+80 −144
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 *  SH7201 setup

 *

 *  Copyright (C) 2008  Peter Griffin pgriffin@mpc-data.co.uk

 *  Copyright (C) 2009  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive
@@ -18,57 +19,32 @@ enum { 
	/* interrupt sources */

	IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,

	PINT0, PINT1, PINT2, PINT3, PINT4, PINT5, PINT6, PINT7,



	ADC_ADI,

	MTU2_TGI0A, MTU2_TGI0B, MTU2_TGI0C, MTU2_TGI0D,

	MTU2_TCI0V, MTU2_TGI0E, MTU2_TGI0F,

	MTU2_TGI1A, MTU2_TGI1B, MTU2_TCI1V, MTU2_TCI1U,

	MTU2_TGI2A, MTU2_TGI2B, MTU2_TCI2V, MTU2_TCI2U,

	MTU2_TGI3A, MTU2_TGI3B, MTU2_TGI3C, MTU2_TGI3D, MTU2_TCI3V,

	MTU2_TGI4A, MTU2_TGI4B, MTU2_TGI4C, MTU2_TGI4D, MTU2_TCI4V,

	MTU2_TGI5U, MTU2_TGI5V, MTU2_TGI5W,

	RTC_ARM, RTC_PRD, RTC_CUP,

	WDT,

	IIC30_STPI, IIC30_NAKI, IIC30_RXI, IIC30_TXI, IIC30_TEI,

	IIC31_STPI, IIC31_NAKI, IIC31_RXI, IIC31_TXI, IIC31_TEI,

	IIC32_STPI, IIC32_NAKI, IIC32_RXI, IIC32_TXI, IIC32_TEI,



	MTU20_ABCD, MTU20_VEF, MTU21_AB, MTU21_VU, MTU22_AB, MTU22_VU,

	MTU23_ABCD, MTU24_ABCD, MTU25_UVW, MTU2_TCI3V, MTU2_TCI4V,



	RTC, WDT,



	IIC30, IIC31, IIC32,



	DMAC0_DMINT0, DMAC1_DMINT1,

	DMAC2_DMINT2, DMAC3_DMINT3,



	SCIF0_BRI, SCIF0_ERI, SCIF0_RXI, SCIF0_TXI,

	SCIF1_BRI, SCIF1_ERI, SCIF1_RXI, SCIF1_TXI,

	SCIF2_BRI, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI,

	SCIF3_BRI, SCIF3_ERI, SCIF3_RXI, SCIF3_TXI,

	SCIF4_BRI, SCIF4_ERI, SCIF4_RXI, SCIF4_TXI,

	SCIF5_BRI, SCIF5_ERI, SCIF5_RXI, SCIF5_TXI,

	SCIF6_BRI, SCIF6_ERI, SCIF6_RXI, SCIF6_TXI,

	SCIF7_BRI, SCIF7_ERI, SCIF7_RXI, SCIF7_TXI,

	SCIF0, SCIF1, SCIF2, SCIF3, SCIF4, SCIF5, SCIF6, SCIF7,



	DMAC0_DMINTA, DMAC4_DMINT4, DMAC5_DMINT5, DMAC6_DMINT6,

	DMAC7_DMINT7,



	RCAN0_ERS, RCAN0_OVR,

	RCAN0_SLE,

	RCAN0_RM0, RCAN0_RM1,



	RCAN1_ERS, RCAN1_OVR,

	RCAN1_SLE,

	RCAN1_RM0, RCAN1_RM1,

	RCAN0, RCAN1,



	SSI0_SSII, SSI1_SSII,



	TMR0_CMIA0, TMR0_CMIB0, TMR0_OVI0,

	TMR1_CMIA1, TMR1_CMIB1, TMR1_OVI1,

	TMR0, TMR1,



	/* interrupt groups */



	IRQ, PINT, ADC,

	MTU20_ABCD, MTU20_VEF, MTU21_AB, MTU21_VU, MTU22_AB, MTU22_VU,

	MTU23_ABCD, MTU24_ABCD, MTU25_UVW,

	RTC, IIC30, IIC31, IIC32,

	SCIF0, SCIF1, SCIF2, SCIF3, SCIF4, SCIF5, SCIF6, SCIF7,

	RCAN0, RCAN1, TMR0, TMR1



	PINT,

};



static struct intc_vect vectors[] __initdata = {
@@ -76,6 +52,7 @@ static struct intc_vect vectors[] __initdata = { 
	INTC_IRQ(IRQ2, 66), INTC_IRQ(IRQ3, 67),

	INTC_IRQ(IRQ4, 68), INTC_IRQ(IRQ5, 69),

	INTC_IRQ(IRQ6, 70), INTC_IRQ(IRQ7, 71),



	INTC_IRQ(PINT0, 80), INTC_IRQ(PINT1, 81),

	INTC_IRQ(PINT2, 82), INTC_IRQ(PINT3, 83),

	INTC_IRQ(PINT4, 84), INTC_IRQ(PINT5, 85),
@@ -83,123 +60,92 @@ static struct intc_vect vectors[] __initdata = { 


	INTC_IRQ(ADC_ADI, 92),



	INTC_IRQ(MTU2_TGI0A, 108), INTC_IRQ(MTU2_TGI0B, 109),

	INTC_IRQ(MTU2_TGI0C, 110), INTC_IRQ(MTU2_TGI0D, 111),

	INTC_IRQ(MTU2_TCI0V, 112),

	INTC_IRQ(MTU2_TGI0E, 113), INTC_IRQ(MTU2_TGI0F, 114),

	INTC_IRQ(MTU20_ABCD, 108), INTC_IRQ(MTU20_ABCD, 109),

	INTC_IRQ(MTU20_ABCD, 110), INTC_IRQ(MTU20_ABCD, 111),



	INTC_IRQ(MTU20_VEF, 112), INTC_IRQ(MTU20_VEF, 113),

	INTC_IRQ(MTU20_VEF, 114),



	INTC_IRQ(MTU21_AB, 116), INTC_IRQ(MTU21_AB, 117),

	INTC_IRQ(MTU21_VU, 120), INTC_IRQ(MTU21_VU, 121),



	INTC_IRQ(MTU2_TGI1A, 116), INTC_IRQ(MTU2_TGI1B, 117),

	INTC_IRQ(MTU2_TCI1V, 120), INTC_IRQ(MTU2_TCI1U, 121),

	INTC_IRQ(MTU22_AB, 124), INTC_IRQ(MTU22_AB, 125),

	INTC_IRQ(MTU22_VU, 128), INTC_IRQ(MTU22_VU, 129),



	INTC_IRQ(MTU2_TGI2A, 124), INTC_IRQ(MTU2_TGI2B, 125),

	INTC_IRQ(MTU2_TCI2V, 128), INTC_IRQ(MTU2_TCI2U, 129),

	INTC_IRQ(MTU23_ABCD, 132), INTC_IRQ(MTU23_ABCD, 133),

	INTC_IRQ(MTU23_ABCD, 134), INTC_IRQ(MTU23_ABCD, 135),



	INTC_IRQ(MTU2_TGI3A, 132), INTC_IRQ(MTU2_TGI3B, 133),

	INTC_IRQ(MTU2_TGI3C, 134), INTC_IRQ(MTU2_TGI3D, 135),

	INTC_IRQ(MTU2_TCI3V, 136),



	INTC_IRQ(MTU2_TGI4A, 140), INTC_IRQ(MTU2_TGI4B, 141),

	INTC_IRQ(MTU2_TGI4C, 142), INTC_IRQ(MTU2_TGI4D, 143),

	INTC_IRQ(MTU24_ABCD, 140), INTC_IRQ(MTU24_ABCD, 141),

	INTC_IRQ(MTU24_ABCD, 142), INTC_IRQ(MTU24_ABCD, 143),



	INTC_IRQ(MTU2_TCI4V, 144),



	INTC_IRQ(MTU2_TGI5U, 148), INTC_IRQ(MTU2_TGI5V, 149),

	INTC_IRQ(MTU2_TGI5W, 150),

	INTC_IRQ(MTU25_UVW, 148), INTC_IRQ(MTU25_UVW, 149),

	INTC_IRQ(MTU25_UVW, 150),



	INTC_IRQ(RTC, 152), INTC_IRQ(RTC, 153),

	INTC_IRQ(RTC, 154),



	INTC_IRQ(RTC_ARM, 152), INTC_IRQ(RTC_PRD, 153),

	INTC_IRQ(RTC_CUP, 154), INTC_IRQ(WDT, 156),

	INTC_IRQ(WDT, 156),



	INTC_IRQ(IIC30_STPI, 157), INTC_IRQ(IIC30_NAKI, 158),

	INTC_IRQ(IIC30_RXI, 159), INTC_IRQ(IIC30_TXI, 160),

	INTC_IRQ(IIC30_TEI, 161),

	INTC_IRQ(IIC30, 157), INTC_IRQ(IIC30, 158),

	INTC_IRQ(IIC30, 159), INTC_IRQ(IIC30, 160),

	INTC_IRQ(IIC30, 161),



	INTC_IRQ(IIC31_STPI, 164), INTC_IRQ(IIC31_NAKI, 165),

	INTC_IRQ(IIC31_RXI, 166), INTC_IRQ(IIC31_TXI, 167),

	INTC_IRQ(IIC31_TEI, 168),

	INTC_IRQ(IIC31, 164), INTC_IRQ(IIC31, 165),

	INTC_IRQ(IIC31, 166), INTC_IRQ(IIC31, 167),

	INTC_IRQ(IIC31, 168),



	INTC_IRQ(IIC32_STPI, 170), INTC_IRQ(IIC32_NAKI, 171),

	INTC_IRQ(IIC32_RXI, 172), INTC_IRQ(IIC32_TXI, 173),

	INTC_IRQ(IIC32_TEI, 174),

	INTC_IRQ(IIC32, 170), INTC_IRQ(IIC32, 171),

	INTC_IRQ(IIC32, 172), INTC_IRQ(IIC32, 173),

	INTC_IRQ(IIC32, 174),



	INTC_IRQ(DMAC0_DMINT0, 176), INTC_IRQ(DMAC1_DMINT1, 177),

	INTC_IRQ(DMAC2_DMINT2, 178), INTC_IRQ(DMAC3_DMINT3, 179),



	INTC_IRQ(SCIF0_BRI, 180), INTC_IRQ(SCIF0_ERI, 181),

	INTC_IRQ(SCIF0_RXI, 182), INTC_IRQ(SCIF0_TXI, 183),

	INTC_IRQ(SCIF1_BRI, 184), INTC_IRQ(SCIF1_ERI, 185),

	INTC_IRQ(SCIF1_RXI, 186), INTC_IRQ(SCIF1_TXI, 187),

	INTC_IRQ(SCIF2_BRI, 188), INTC_IRQ(SCIF2_ERI, 189),

	INTC_IRQ(SCIF2_RXI, 190), INTC_IRQ(SCIF2_TXI, 191),

	INTC_IRQ(SCIF3_BRI, 192), INTC_IRQ(SCIF3_ERI, 193),

	INTC_IRQ(SCIF3_RXI, 194), INTC_IRQ(SCIF3_TXI, 195),

	INTC_IRQ(SCIF4_BRI, 196), INTC_IRQ(SCIF4_ERI, 197),

	INTC_IRQ(SCIF4_RXI, 198), INTC_IRQ(SCIF4_TXI, 199),

	INTC_IRQ(SCIF5_BRI, 200), INTC_IRQ(SCIF5_ERI, 201),

	INTC_IRQ(SCIF5_RXI, 202), INTC_IRQ(SCIF5_TXI, 203),

	INTC_IRQ(SCIF6_BRI, 204), INTC_IRQ(SCIF6_ERI, 205),

	INTC_IRQ(SCIF6_RXI, 206), INTC_IRQ(SCIF6_TXI, 207),

	INTC_IRQ(SCIF7_BRI, 208), INTC_IRQ(SCIF7_ERI, 209),

	INTC_IRQ(SCIF7_RXI, 210), INTC_IRQ(SCIF7_TXI, 211),

	INTC_IRQ(SCIF0, 180), INTC_IRQ(SCIF0, 181),

	INTC_IRQ(SCIF0, 182), INTC_IRQ(SCIF0, 183),

	INTC_IRQ(SCIF1, 184), INTC_IRQ(SCIF1, 185),

	INTC_IRQ(SCIF1, 186), INTC_IRQ(SCIF1, 187),

	INTC_IRQ(SCIF2, 188), INTC_IRQ(SCIF2, 189),

	INTC_IRQ(SCIF2, 190), INTC_IRQ(SCIF2, 191),

	INTC_IRQ(SCIF3, 192), INTC_IRQ(SCIF3, 193),

	INTC_IRQ(SCIF3, 194), INTC_IRQ(SCIF3, 195),

	INTC_IRQ(SCIF4, 196), INTC_IRQ(SCIF4, 197),

	INTC_IRQ(SCIF4, 198), INTC_IRQ(SCIF4, 199),

	INTC_IRQ(SCIF5, 200), INTC_IRQ(SCIF5, 201),

	INTC_IRQ(SCIF5, 202), INTC_IRQ(SCIF5, 203),

	INTC_IRQ(SCIF6, 204), INTC_IRQ(SCIF6, 205),

	INTC_IRQ(SCIF6, 206), INTC_IRQ(SCIF6, 207),

	INTC_IRQ(SCIF7, 208), INTC_IRQ(SCIF7, 209),

	INTC_IRQ(SCIF7, 210), INTC_IRQ(SCIF7, 211),



	INTC_IRQ(DMAC0_DMINTA, 212), INTC_IRQ(DMAC4_DMINT4, 216),

	INTC_IRQ(DMAC5_DMINT5, 217), INTC_IRQ(DMAC6_DMINT6, 218),

	INTC_IRQ(DMAC7_DMINT7, 219),



	INTC_IRQ(RCAN0_ERS, 228), INTC_IRQ(RCAN0_OVR, 229),

	INTC_IRQ(RCAN0_SLE, 230),

	INTC_IRQ(RCAN0_RM0, 231), INTC_IRQ(RCAN0_RM1, 232),

	INTC_IRQ(RCAN0, 228), INTC_IRQ(RCAN0, 229),

	INTC_IRQ(RCAN0, 230),

	INTC_IRQ(RCAN0, 231), INTC_IRQ(RCAN0, 232),



	INTC_IRQ(RCAN1_ERS, 234), INTC_IRQ(RCAN1_OVR, 235),

	INTC_IRQ(RCAN1_SLE, 236),

	INTC_IRQ(RCAN1_RM0, 237), INTC_IRQ(RCAN1_RM1, 238),

	INTC_IRQ(RCAN1, 234), INTC_IRQ(RCAN1, 235),

	INTC_IRQ(RCAN1, 236),

	INTC_IRQ(RCAN1, 237), INTC_IRQ(RCAN1, 238),



	INTC_IRQ(SSI0_SSII, 244), INTC_IRQ(SSI1_SSII, 245),



	INTC_IRQ(TMR0_CMIA0, 246), INTC_IRQ(TMR0_CMIB0, 247),

	INTC_IRQ(TMR0_OVI0, 248),



	INTC_IRQ(TMR1_CMIA1, 252), INTC_IRQ(TMR1_CMIB1, 253),

	INTC_IRQ(TMR1_OVI1, 254),

	INTC_IRQ(TMR0, 246), INTC_IRQ(TMR0, 247),

	INTC_IRQ(TMR0, 248),



	INTC_IRQ(TMR1, 252), INTC_IRQ(TMR1, 253),

	INTC_IRQ(TMR1, 254),

};



static struct intc_group groups[] __initdata = {

	INTC_GROUP(PINT, PINT0, PINT1, PINT2, PINT3,

		   PINT4, PINT5, PINT6, PINT7),

	INTC_GROUP(MTU20_ABCD, MTU2_TGI0A, MTU2_TGI0B, MTU2_TGI0C, MTU2_TGI0D),

	INTC_GROUP(MTU20_VEF, MTU2_TCI0V, MTU2_TGI0E, MTU2_TGI0F),



	INTC_GROUP(MTU21_AB, MTU2_TGI1A, MTU2_TGI1B),

	INTC_GROUP(MTU21_VU, MTU2_TCI1V, MTU2_TCI1U),

	INTC_GROUP(MTU22_AB, MTU2_TGI2A, MTU2_TGI2B),

	INTC_GROUP(MTU22_VU, MTU2_TCI2V, MTU2_TCI2U),

	INTC_GROUP(MTU23_ABCD, MTU2_TGI3A, MTU2_TGI3B, MTU2_TGI3C, MTU2_TGI3D),

	INTC_GROUP(MTU24_ABCD, MTU2_TGI4A, MTU2_TGI4B, MTU2_TGI4C, MTU2_TGI4D),

	INTC_GROUP(MTU25_UVW, MTU2_TGI5U, MTU2_TGI5V, MTU2_TGI5W),

	INTC_GROUP(RTC, RTC_ARM, RTC_PRD, RTC_CUP ),



	INTC_GROUP(IIC30, IIC30_STPI, IIC30_NAKI, IIC30_RXI, IIC30_TXI,

		   IIC30_TEI),

	INTC_GROUP(IIC31, IIC31_STPI, IIC31_NAKI, IIC31_RXI, IIC31_TXI,

		   IIC31_TEI),

	INTC_GROUP(IIC32, IIC32_STPI, IIC32_NAKI, IIC32_RXI, IIC32_TXI,

		   IIC32_TEI),



	INTC_GROUP(SCIF0, SCIF0_BRI, SCIF0_ERI, SCIF0_RXI, SCIF0_TXI),

	INTC_GROUP(SCIF1, SCIF1_BRI, SCIF1_ERI, SCIF1_RXI, SCIF1_TXI),

	INTC_GROUP(SCIF2, SCIF2_BRI, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI),

	INTC_GROUP(SCIF3, SCIF3_BRI, SCIF3_ERI, SCIF3_RXI, SCIF3_TXI),

	INTC_GROUP(SCIF4, SCIF4_BRI, SCIF4_ERI, SCIF4_RXI, SCIF4_TXI),

	INTC_GROUP(SCIF5, SCIF5_BRI, SCIF5_ERI, SCIF5_RXI, SCIF5_TXI),

	INTC_GROUP(SCIF6, SCIF6_BRI, SCIF6_ERI, SCIF6_RXI, SCIF6_TXI),

	INTC_GROUP(SCIF7, SCIF7_BRI, SCIF7_ERI, SCIF7_RXI, SCIF7_TXI),



	INTC_GROUP(RCAN0, RCAN0_ERS, RCAN0_OVR, RCAN0_RM0, RCAN0_RM1,

		   RCAN0_SLE),

	INTC_GROUP(RCAN1, RCAN1_ERS, RCAN1_OVR, RCAN1_RM0, RCAN1_RM1,

		   RCAN1_SLE),



	INTC_GROUP(TMR0, TMR0_CMIA0, TMR0_CMIB0, TMR0_OVI0),

	INTC_GROUP(TMR1, TMR1_CMIA1, TMR1_CMIB1, TMR1_OVI1),

};



static struct intc_prio_reg prio_registers[] __initdata = {
@@ -234,42 +180,42 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xfffe8000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 181, 182, 183, 180}

		.irqs		= { 180, 180, 180, 180 }

	}, {

		.mapbase	= 0xfffe8800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 185, 186, 187, 184}

		.irqs		= { 184, 184, 184, 184 }

	}, {

		.mapbase	= 0xfffe9000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 189, 186, 187, 188}

		.irqs		= { 188, 188, 188, 188 }

	}, {

		.mapbase	= 0xfffe9800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 193, 194, 195, 192}

		.irqs		= { 192, 192, 192, 192 }

	}, {

		.mapbase	= 0xfffea000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 196, 198, 199, 196}

		.irqs		= { 196, 196, 196, 196 }

	}, {

		.mapbase	= 0xfffea800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 201, 202, 203, 200}

		.irqs		= { 200, 200, 200, 200 }

	}, {

		.mapbase	= 0xfffeb000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 205, 206, 207, 204}

		.irqs		= { 204, 204, 204, 204 }

	}, {

		.mapbase	= 0xfffeb800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		= { 209, 210, 211, 208}

		.irqs		= { 208, 208, 208, 208 }

	}, {

		.flags = 0,

	}
@@ -290,17 +236,7 @@ static struct resource rtc_resources[] = { 
		.flags	= IORESOURCE_IO,

	},

	[1] = {

		/* Period IRQ */

		.start	= 153,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* Carry IRQ */

		.start	= 154,

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		/* Alarm IRQ */

		/* Shared Period/Carry/Alarm IRQ */

		.start	= 152,

		.flags	= IORESOURCE_IRQ,

	},