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

Commit 5c37e025 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: intc - mark data structures as __initdata 



With the intc core improved it is now possible to put the intc data
structures in the initdata section.

Version two of this patch puts the __initdata inside DECLARE_INTC_DESC()
and removes the __initdata included in the board specific r2d code.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 46420e49

arch/sh/boards/renesas/rts7751r2d/irq.c

+4 −6
Original line number Diff line number Diff line
@@ -71,9 +71,8 @@ static unsigned char irl2irq_r2d_1[R2D_NR_IRL] __initdata = { 
	IRQ_TP,

};



static __initdata DECLARE_INTC_DESC(intc_desc_r2d_1, "r2d-1",

				    vectors_r2d_1, NULL, NULL,

				    mask_registers_r2d_1, NULL, NULL);

static DECLARE_INTC_DESC(intc_desc_r2d_1, "r2d-1", vectors_r2d_1,

			 NULL, NULL, mask_registers_r2d_1, NULL, NULL);



#endif /* CONFIG_RTS7751R2D_1 */
@@ -110,9 +109,8 @@ static unsigned char irl2irq_r2d_plus[R2D_NR_IRL] __initdata = { 
	IRQ_TP,

};



static __initdata DECLARE_INTC_DESC(intc_desc_r2d_plus, "r2d-plus",

				    vectors_r2d_plus, NULL, NULL,

				    mask_registers_r2d_plus, NULL, NULL);

static DECLARE_INTC_DESC(intc_desc_r2d_plus, "r2d-plus", vectors_r2d_plus,

			 NULL, NULL, mask_registers_r2d_plus, NULL, NULL);



#endif /* CONFIG_RTS7751R2D_PLUS */

arch/sh/cchips/voyagergx/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum { 
	UH, TWOD, ZD, PV, CI,

};



static struct intc_vect vectors[] = {

static struct intc_vect vectors[] __initdata = {

	INTC_IRQ(UP, IRQ_SM501_UP), INTC_IRQ(G54, IRQ_SM501_G54),

	INTC_IRQ(G53, IRQ_SM501_G53), INTC_IRQ(G52, IRQ_SM501_G52),

	INTC_IRQ(G51, IRQ_SM501_G51), INTC_IRQ(G50, IRQ_SM501_G50),
@@ -49,7 +49,7 @@ static struct intc_vect vectors[] = { 
	INTC_IRQ(PV, IRQ_SM501_PV), INTC_IRQ(CI, IRQ_SM501_CI),

};



static struct intc_mask_reg mask_registers[] = {

static struct intc_mask_reg mask_registers[] __initdata = {

	{ VOYAGER_INT_MASK, 0, 32, /* "Interrupt Mask", MMIO_base + 0x30 */

	  { UP, G54, G53, G52, G51, G50, G49, G48,

	    I2C, PW, 0, DMA, PCI, I2S, AC, US,

arch/sh/kernel/cpu/sh3/setup-sh7705.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ enum { 
	RTC, TMU2, DMAC, USB, SCIF2, SCIF0,

};



static struct intc_vect vectors[] = {

static struct intc_vect vectors[] __initdata = {

	INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0),

	INTC_VECT(PINT07, 0x700), INTC_VECT(PINT815, 0x720),

	INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820),
@@ -57,7 +57,7 @@ static struct intc_vect vectors[] = { 
	INTC_VECT(REF_RCMI, 0x580),

};



static struct intc_group groups[] = {

static struct intc_group groups[] __initdata = {

	INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),

	INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI),

	INTC_GROUP(DMAC, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3),
@@ -66,13 +66,13 @@ static struct intc_group groups[] = { 
	INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI),

};



static struct intc_prio priorities[] = {

static struct intc_prio priorities[] __initdata = {

	INTC_PRIO(DMAC, 7),

	INTC_PRIO(SCIF2, 3),

	INTC_PRIO(SCIF0, 3),

};



static struct intc_prio_reg prio_registers[] = {

static struct intc_prio_reg prio_registers[] __initdata = {

	{ 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },

	{ 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } },

	{ 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },
@@ -87,7 +87,7 @@ static struct intc_prio_reg prio_registers[] = { 
static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups,

			 priorities, NULL, prio_registers, NULL);



static struct intc_vect vectors_irq[] = {

static struct intc_vect vectors_irq[] __initdata = {

	INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),

	INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660),

};

arch/sh/kernel/cpu/sh3/setup-sh770x.c

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ enum { 
	RTC, REF, TMU2, DMAC, SCI, SCIF2, SCIF0,

};



static struct intc_vect vectors[] = {

static struct intc_vect vectors[] __initdata = {

	INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),

	INTC_VECT(TMU2_TUNI, 0x440), INTC_VECT(TMU2_TICPI, 0x460),

	INTC_VECT(RTC_ATI, 0x480), INTC_VECT(RTC_PRI, 0x4a0),
@@ -71,7 +71,7 @@ static struct intc_vect vectors[] = { 
#endif

};



static struct intc_group groups[] = {

static struct intc_group groups[] __initdata = {

	INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),

	INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI),

	INTC_GROUP(REF, REF_RCMI, REF_ROVI),
@@ -81,14 +81,14 @@ static struct intc_group groups[] = { 
	INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI),

};



static struct intc_prio priorities[] = {

static struct intc_prio priorities[] __initdata = {

	INTC_PRIO(DMAC, 7),

	INTC_PRIO(SCI, 3),

	INTC_PRIO(SCIF2, 3),

	INTC_PRIO(SCIF0, 3),

};



static struct intc_prio_reg prio_registers[] = {

static struct intc_prio_reg prio_registers[] __initdata = {

	{ 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },

	{ 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, SCI, 0 } },

#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
@@ -114,7 +114,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh770x", vectors, groups, 
#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

static struct intc_vect vectors_irq[] = {

static struct intc_vect vectors_irq[] __initdata = {

	INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),

	INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660),

};

arch/sh/kernel/cpu/sh3/setup-sh7710.c

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ enum { 
	RTC, DMAC1, SCIF0, SCIF1, DMAC2, SIOF0, SIOF1,

};



static struct intc_vect vectors[] = {

static struct intc_vect vectors[] __initdata = {

	INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0),

	INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820),

	INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860),
@@ -63,7 +63,7 @@ static struct intc_vect vectors[] = { 
	INTC_VECT(REF, 0x580),

};



static struct intc_group groups[] = {

static struct intc_group groups[] __initdata = {

	INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),

	INTC_GROUP(DMAC1, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3),

	INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI),
@@ -73,7 +73,7 @@ static struct intc_group groups[] = { 
	INTC_GROUP(SIOF1, SIOF1_ERI, SIOF1_TXI, SIOF1_RXI, SIOF1_CCI),

};



static struct intc_prio priorities[] = {

static struct intc_prio priorities[] __initdata = {

	INTC_PRIO(DMAC1, 7),

	INTC_PRIO(DMAC2, 7),

	INTC_PRIO(SCIF0, 3),
@@ -85,7 +85,7 @@ static struct intc_prio priorities[] = { 
	INTC_PRIO(EDMAC2, 5),

};



static struct intc_prio_reg prio_registers[] = {

static struct intc_prio_reg prio_registers[] __initdata = {

	{ 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },

	{ 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } },

	{ 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },
@@ -103,7 +103,7 @@ static struct intc_prio_reg prio_registers[] = { 
static DECLARE_INTC_DESC(intc_desc, "sh7710", vectors, groups,

			 priorities, NULL, prio_registers, NULL);



static struct intc_vect vectors_irq[] = {

static struct intc_vect vectors_irq[] __initdata = {

	INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),

	INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660),

};