Commit 79ce21a6 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: sh7760 evt2irq migration. 



Migrate SH7760 to evt2irq() backed hwirq lookups.

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

arch/sh/kernel/cpu/sh4/setup-sh7760.c

+19 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/init.h>

#include <linux/serial.h>

#include <linux/sh_timer.h>

#include <linux/sh_intc.h>

#include <linux/serial_sci.h>

#include <linux/io.h>
@@ -132,7 +133,10 @@ static struct plat_sci_port scif0_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.irqs		= { 52, 53, 55, 54 },

	.irqs		= { evt2irq(0x880),

			    evt2irq(0x8a0),

			    evt2irq(0x8e0),

			    evt2irq(0x8c0) },

	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,

};
@@ -150,7 +154,10 @@ static struct plat_sci_port scif1_platform_data = { 
	.type		= PORT_SCIF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.irqs		= { 72, 73, 75, 74 },

	.irqs		= { evt2irq(0xb00),

			    evt2irq(0xb20),

			    evt2irq(0xb60),

			    evt2irq(0xb40) },

	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,

};
@@ -168,7 +175,10 @@ static struct plat_sci_port scif2_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.irqs		= { 76, 77, 79, 78 },

	.irqs		= { evt2irq(0xb80),

			    evt2irq(0xba0),

			    evt2irq(0xbe0),

			    evt2irq(0xbc0) },

	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,

};
@@ -186,7 +196,9 @@ static struct plat_sci_port scif3_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCI,

	.irqs		= { 80, 81, 82, 0 },

	.irqs		= { evt2irq(0xc00),

			    evt2irq(0xc20),

			    evt2irq(0xc40), },

	.regshift	= 2,

};
@@ -211,7 +223,7 @@ static struct resource tmu0_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 16,

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -239,7 +251,7 @@ static struct resource tmu1_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 17,

		.start	= evt2irq(0x420),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -266,7 +278,7 @@ static struct resource tmu2_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 18,

		.start	= evt2irq(0x440),

		.flags	= IORESOURCE_IRQ,

	},

};