Commit 780a1568 authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Paul Mundt
Browse files

sh: IPR IRQ updates for SH7619/SH7206. 



This updates the SH7619 and SH7206 code for the IPR IRQ changes.

Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent ff4e2ca7

arch/sh/boards/se/7206/irq.c

+12 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <asm/se7206.h>



#define INTSTS0 0x31800000
@@ -18,6 +19,13 @@ 
#define INTMSK1 0x31800006

#define INTSEL  0x31800008



#define IRQ0_IRQ 64

#define IRQ1_IRQ 65

#define IRQ3_IRQ 67



#define INTC_IPR01 0xfffe0818

#define INTC_ICR1  0xfffe0802



static void disable_se7206_irq(unsigned int irq)

{

	unsigned short val;
@@ -39,7 +47,7 @@ static void disable_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

		msk0 |= 0x000f;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		msk0 |= 0x0f00;

		msk1 |= 0x00ff;

		break;
@@ -70,7 +78,7 @@ static void enable_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

		msk0 &= ~0x000f;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		msk0 &= ~0x0f00;

		msk1 &= ~0x00ff;

		break;
@@ -96,7 +104,7 @@ static void eoi_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

		sts0 &= ~0x000f;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		sts0 &= ~0x0f00;

		sts1 &= ~0x00ff;

		break;
@@ -106,7 +114,7 @@ static void eoi_se7206_irq(unsigned int irq) 
}



static struct irq_chip se7206_irq_chip __read_mostly = {

	.name		= "SE7206-FPGA-IRQ",

	.name		= "SE7206-FPGA",

	.mask		= disable_se7206_irq,

	.unmask		= enable_se7206_irq,

	.mask_ack	= disable_se7206_irq,

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+41 −0
Original line number Diff line number Diff line
@@ -51,3 +51,44 @@ static int __init sh7619_devices_setup(void) 
				    ARRAY_SIZE(sh7619_devices));

}

__initcall(sh7619_devices_setup);



#define INTC_IPRC      0xf8080000UL

#define INTC_IPRD      0xf8080002UL



#define CMI0_IRQ       86



#define SCIF0_ERI_IRQ  88

#define SCIF0_RXI_IRQ  89

#define SCIF0_BRI_IRQ  90

#define SCIF0_TXI_IRQ  91



#define SCIF1_ERI_IRQ  92

#define SCIF1_RXI_IRQ  93

#define SCIF1_BRI_IRQ  94

#define SCIF1_TXI_IRQ  95



#define SCIF2_BRI_IRQ  96

#define SCIF2_ERI_IRQ  97

#define SCIF2_RXI_IRQ  98

#define SCIF2_TXI_IRQ  99



static struct ipr_data sh7619_ipr_map[] = {

	{ CMI0_IRQ,      INTC_IPRC, 1, 2 },

	{ SCIF0_ERI_IRQ, INTC_IPRD, 3, 3 },

	{ SCIF0_RXI_IRQ, INTC_IPRD, 3, 3 },

	{ SCIF0_BRI_IRQ, INTC_IPRD, 3, 3 },

	{ SCIF0_TXI_IRQ, INTC_IPRD, 3, 3 },

	{ SCIF1_ERI_IRQ, INTC_IPRD, 2, 3 },

	{ SCIF1_RXI_IRQ, INTC_IPRD, 2, 3 },

	{ SCIF1_BRI_IRQ, INTC_IPRD, 2, 3 },

	{ SCIF1_TXI_IRQ, INTC_IPRD, 2, 3 },

	{ SCIF2_ERI_IRQ, INTC_IPRD, 1, 3 },

	{ SCIF2_RXI_IRQ, INTC_IPRD, 1, 3 },

	{ SCIF2_BRI_IRQ, INTC_IPRD, 1, 3 },

	{ SCIF2_TXI_IRQ, INTC_IPRD, 1, 3 },

};



void __init init_IRQ_ipr(void)

{

	make_ipr_irq(sh7619_ipr_map, ARRAY_SIZE(sh7619_ipr_map));

}

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

+58 −4
Original line number Diff line number Diff line
@@ -17,22 +17,22 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xfffe8000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		=  { 240, 241, 242, 243},

		.irqs		=  { 241, 242, 243, 240},

	}, {

		.mapbase	= 0xfffe8800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		=  { 244, 245, 246, 247},

		.irqs		=  { 247, 244, 245, 246},

	}, {

		.mapbase	= 0xfffe9000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		=  { 248, 249, 250, 251},

		.irqs		=  { 249, 250, 251, 248},

	}, {

		.mapbase	= 0xfffe9800,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCIF,

		.irqs		=  { 252, 253, 254, 255},

		.irqs		=  { 253, 254, 255, 252},

	}, {

		.flags = 0,

	}
@@ -56,3 +56,57 @@ static int __init sh7206_devices_setup(void) 
				    ARRAY_SIZE(sh7206_devices));

}

__initcall(sh7206_devices_setup);



#define INTC_IPR08     0xfffe0c04UL

#define INTC_IPR09     0xfffe0c06UL

#define INTC_IPR14     0xfffe0c10UL



#define CMI0_IRQ       140



#define MTU1_TGI1A     164



#define SCIF0_BRI_IRQ  240

#define SCIF0_ERI_IRQ  241

#define SCIF0_RXI_IRQ  242

#define SCIF0_TXI_IRQ  243



#define SCIF1_BRI_IRQ  244

#define SCIF1_ERI_IRQ  245

#define SCIF1_RXI_IRQ  246

#define SCIF1_TXI_IRQ  247



#define SCIF2_BRI_IRQ  248

#define SCIF2_ERI_IRQ  249

#define SCIF2_RXI_IRQ  250

#define SCIF2_TXI_IRQ  251



#define SCIF3_BRI_IRQ  252

#define SCIF3_ERI_IRQ  253

#define SCIF3_RXI_IRQ  254

#define SCIF3_TXI_IRQ  255



static struct ipr_data sh7206_ipr_map[] = {

	{ CMI0_IRQ,      INTC_IPR08, 3, 2 },

	{ MTU2_TGI1A,    INTC_IPR09, 1, 2 },

	{ SCIF0_ERI_IRQ, INTC_IPR14, 3, 3 },

	{ SCIF0_RXI_IRQ, INTC_IPR14, 3, 3 },

	{ SCIF0_BRI_IRQ, INTC_IPR14, 3, 3 },

	{ SCIF0_TXI_IRQ, INTC_IPR14, 3, 3 },

	{ SCIF1_ERI_IRQ, INTC_IPR14, 2, 3 },

	{ SCIF1_RXI_IRQ, INTC_IPR14, 2, 3 },

	{ SCIF1_BRI_IRQ, INTC_IPR14, 2, 3 },

	{ SCIF1_TXI_IRQ, INTC_IPR14, 2, 3 },

	{ SCIF2_ERI_IRQ, INTC_IPR14, 1, 3 },

	{ SCIF2_RXI_IRQ, INTC_IPR14, 1, 3 },

	{ SCIF2_BRI_IRQ, INTC_IPR14, 1, 3 },

	{ SCIF2_TXI_IRQ, INTC_IPR14, 1, 3 },

	{ SCIF3_ERI_IRQ, INTC_IPR14, 0, 3 },

	{ SCIF3_RXI_IRQ, INTC_IPR14, 0, 3 },

	{ SCIF3_BRI_IRQ, INTC_IPR14, 0, 3 },

	{ SCIF3_TXI_IRQ, INTC_IPR14, 0, 3 },

};



void __init init_IRQ_ipr(void)

{

	make_ipr_irq(sh7206_ipr_map, ARRAY_SIZE(sh7206_ipr_map));

}