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

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

ARM: mach-shmobile: sh7372 INTCS MFIS2 interrupt update 



Enable the MFIS2 interrupt source in the INTCS interrupt
controller included in the sh7372 processor. The priority
field is constantly enabled to let the interrupt through to
both the ARM side and the SH side.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a33bb8a2

arch/arm/mach-shmobile/intc-sh7372.c

+7 −4
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ static struct intc_desc intca_desc __initdata = { 


enum {

	UNUSED_INTCS = 0,

	ENABLED_INTCS,



	INTCS,
@@ -413,7 +414,7 @@ enum { 
	CMT4,

	DSITX1_DSITX1_0,

	DSITX1_DSITX1_1,

	/* MFIS2 */

	MFIS2_INTCS, /* Priority always enabled using ENABLED_INTCS */

	CPORTS2R,

	/* CEC */

	JPU6E,
@@ -477,7 +478,7 @@ static struct intc_vect intcs_vectors[] = { 
	INTCS_VECT(CMT4, 0x1980),

	INTCS_VECT(DSITX1_DSITX1_0, 0x19a0),

	INTCS_VECT(DSITX1_DSITX1_1, 0x19c0),

	/* MFIS2 */

	INTCS_VECT(MFIS2_INTCS, 0x1a00),

	INTCS_VECT(CPORTS2R, 0x1a20),

	/* CEC */

	INTCS_VECT(JPU6E, 0x1a80),
@@ -543,7 +544,7 @@ static struct intc_mask_reg intcs_mask_registers[] = { 
	  { 0, TMU1_TUNI2, TMU1_TUNI1, TMU1_TUNI0,

	    CMT4, DSITX1_DSITX1_0, DSITX1_DSITX1_1, 0 } },

	{ 0xffd5019c, 0xffd501dc, 8, /* IMR7SA3 / IMCR7SA3 */

	  { 0, CPORTS2R, 0, 0,

	  { MFIS2_INTCS, CPORTS2R, 0, 0,

	    JPU6E, 0, 0, 0 } },

	{ 0xffd20104, 0, 16, /* INTAMASK */

	  { 0, 0, 0, 0, 0, 0, 0, 0,
@@ -571,7 +572,8 @@ static struct intc_prio_reg intcs_prio_registers[] = { 
	{ 0xffd50030, 0, 16, 4, /* IPRMS3 */ { TMU1, 0, 0, 0 } },

	{ 0xffd50034, 0, 16, 4, /* IPRNS3 */ { CMT4, DSITX1_DSITX1_0,

					       DSITX1_DSITX1_1, 0 } },

	{ 0xffd50038, 0, 16, 4, /* IPROS3 */ { 0, CPORTS2R, 0, 0 } },

	{ 0xffd50038, 0, 16, 4, /* IPROS3 */ { ENABLED_INTCS, CPORTS2R,

					       0, 0 } },

	{ 0xffd5003c, 0, 16, 4, /* IPRPS3 */ { JPU6E, 0, 0, 0 } },

};
@@ -590,6 +592,7 @@ static struct resource intcs_resources[] __initdata = { 


static struct intc_desc intcs_desc __initdata = {

	.name = "sh7372-intcs",

	.force_enable = ENABLED_INTCS,

	.resource = intcs_resources,

	.num_resources = ARRAY_SIZE(intcs_resources),

	.hw = INTC_HW_DESC(intcs_vectors, intcs_groups, intcs_mask_registers,