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

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

sh: unify external irq pin code for sh3 



This patch unifies the sh3 external irq pin code. It buys us some
savings with reduced code redundancy, but the main feature with
this change is irq sense selection support for all sh3 processors.

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

arch/sh/kernel/cpu/sh3/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the Linux/SuperH SH-3 backends.

#



obj-y	:= ex.o probe.o entry.o

obj-y	:= ex.o probe.o entry.o setup-sh3.o



# CPU subtype setup

obj-$(CONFIG_CPU_SUBTYPE_SH7705)	+= setup-sh7705.o

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

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Shared SH3 Setup code

 *

 *  Copyright (C) 2008  Magnus Damm

 *

 * 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

 * for more details.

 */



#include <linux/init.h>

#include <linux/irq.h>

#include <linux/io.h>



/* All SH3 devices are equipped with IRQ0->5 (except sh7708) */



enum {

	UNUSED = 0,



	/* interrupt sources */

	IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5,

};



static struct intc_vect vectors_irq0123[] __initdata = {

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

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

};



static struct intc_vect vectors_irq45[] __initdata = {

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

};



static struct intc_prio_reg prio_registers[] __initdata = {

	{ 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },

	{ 0xa4000018, 0, 16, 4, /* IPRD */ { 0, 0, IRQ5, IRQ4 } },

};



static struct intc_sense_reg sense_registers[] __initdata = {

	{ 0xa4000010, 16, 2, { 0, 0, IRQ5, IRQ4, IRQ3, IRQ2, IRQ1, IRQ0 } },

};



static DECLARE_INTC_DESC(intc_desc_irq0123, "sh3-irq0123", vectors_irq0123,

			 NULL, NULL, prio_registers, sense_registers);



static DECLARE_INTC_DESC(intc_desc_irq45, "sh3-irq45", vectors_irq45,

			 NULL, NULL, prio_registers, sense_registers);



#define INTC_ICR1		0xa4000010UL

#define INTC_ICR1_IRQLVL	(1<<14)



void __init plat_irq_setup_pins(int mode)

{

	if (mode == IRQ_MODE_IRQ) {

		ctrl_outw(ctrl_inw(INTC_ICR1) & ~INTC_ICR1_IRQLVL, INTC_ICR1);

		register_intc_controller(&intc_desc_irq0123);

		return;

	}

	BUG();

}



void __init plat_irq_setup_sh3(void)

{

	register_intc_controller(&intc_desc_irq45);

}

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

+2 −18
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ enum { 
};



static struct intc_vect vectors[] __initdata = {

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

	/* IRQ0->5 are handled in setup-sh3.c */

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

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

	INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860),
@@ -81,14 +81,6 @@ static struct intc_prio_reg prio_registers[] __initdata = { 
static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups,

			 NULL, prio_registers, NULL);



static struct intc_vect vectors_irq[] __initdata = {

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

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

};



static DECLARE_INTC_DESC(intc_desc_irq, "sh7705-irq", vectors_irq, NULL,

			 NULL, prio_registers, NULL);



static struct plat_sci_port sci_platform_data[] = {

	{

		.mapbase	= 0xa4410000,
@@ -159,16 +151,8 @@ static int __init sh7705_devices_setup(void) 
}

__initcall(sh7705_devices_setup);



void __init plat_irq_setup_pins(int mode)

{

	if (mode == IRQ_MODE_IRQ) {

		register_intc_controller(&intc_desc_irq);

		return;

	}

	BUG();

}



void __init plat_irq_setup(void)

{

	register_intc_controller(&intc_desc);

	plat_irq_setup_sh3();

}

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

+4 −28
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static struct intc_vect vectors[] __initdata = { 
#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

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

	/* IRQ0->5 are handled in setup-sh3.c */

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

	INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860),

	INTC_VECT(ADC_ADI, 0x980),
@@ -104,18 +104,6 @@ static struct intc_prio_reg prio_registers[] __initdata = { 
static DECLARE_INTC_DESC(intc_desc, "sh770x", vectors, groups,

			 NULL, prio_registers, NULL);



#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

static struct intc_vect vectors_irq[] __initdata = {

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

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

};



static DECLARE_INTC_DESC(intc_desc_irq, "sh770x-irq", vectors_irq, NULL,

			 NULL, prio_registers, NULL);

#endif



static struct resource rtc_resources[] = {

	[0] =	{

		.start	= 0xfffffec0,
@@ -194,24 +182,12 @@ static int __init sh770x_devices_setup(void) 
}

__initcall(sh770x_devices_setup);



#define INTC_ICR1		0xa4000010UL

#define INTC_ICR1_IRQLVL	(1<<14)



void __init plat_irq_setup_pins(int mode)

void __init plat_irq_setup(void)

{

	if (mode == IRQ_MODE_IRQ) {

	register_intc_controller(&intc_desc);

#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

		ctrl_outw(ctrl_inw(INTC_ICR1) & ~INTC_ICR1_IRQLVL, INTC_ICR1);

		register_intc_controller(&intc_desc_irq);

		return;

	plat_irq_setup_sh3();

#endif

}
 
	BUG();

}



void __init plat_irq_setup(void)

{

	register_intc_controller(&intc_desc);

}

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

+2 −18
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ enum { 
};



static struct intc_vect vectors[] __initdata = {

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

	/* IRQ0->5 are handled in setup-sh3.c */

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

	INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860),

	INTC_VECT(SCIF0_ERI, 0x880), INTC_VECT(SCIF0_RXI, 0x8a0),
@@ -91,14 +91,6 @@ static struct intc_prio_reg prio_registers[] __initdata = { 
static DECLARE_INTC_DESC(intc_desc, "sh7710", vectors, groups,

			 NULL, prio_registers, NULL);



static struct intc_vect vectors_irq[] __initdata = {

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

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

};



static DECLARE_INTC_DESC(intc_desc_irq, "sh7710-irq", vectors_irq, NULL,

			 NULL, prio_registers, NULL);



static struct resource rtc_resources[] = {

	[0] =	{

		.start	= 0xa413fec0,
@@ -170,16 +162,8 @@ static int __init sh7710_devices_setup(void) 
}

__initcall(sh7710_devices_setup);



void __init plat_irq_setup_pins(int mode)

{

	if (mode == IRQ_MODE_IRQ) {

		register_intc_controller(&intc_desc_irq);

		return;

	}

	BUG();

}



void __init plat_irq_setup(void)

{

	register_intc_controller(&intc_desc);

	plat_irq_setup_sh3();

}