Commit de410b53 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: sh7343 evt2irq migration. 



Migrate SH7343 to evt2irq() backed hwirq lookups.

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

arch/sh/kernel/cpu/sh4a/setup-sh7343.c

+16 −15
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/serial_sci.h>

#include <linux/uio_driver.h>

#include <linux/sh_timer.h>

#include <linux/sh_intc.h>

#include <asm/clock.h>



/* Serial */
@@ -22,7 +23,7 @@ static struct plat_sci_port scif0_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.irqs           = { 80, 80, 80, 80 },

	.irqs           = SCIx_IRQ_MUXED(evt2irq(0xc00)),

};



static struct platform_device scif0_device = {
@@ -39,7 +40,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.irqs           = { 81, 81, 81, 81 },

	.irqs           = SCIx_IRQ_MUXED(evt2irq(0xc20)),

};



static struct platform_device scif1_device = {
@@ -56,7 +57,7 @@ static struct plat_sci_port scif2_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.irqs           = { 82, 82, 82, 82 },

	.irqs           = SCIx_IRQ_MUXED(evt2irq(0xc40)),

};



static struct platform_device scif2_device = {
@@ -73,7 +74,7 @@ static struct plat_sci_port scif3_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.irqs           = { 83, 83, 83, 83 },

	.irqs           = SCIx_IRQ_MUXED(evt2irq(0xc60)),

};



static struct platform_device scif3_device = {
@@ -92,8 +93,8 @@ static struct resource iic0_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 96,

		.end    = 99,

		.start  = evt2irq(0xe00),

		.end    = evt2irq(0xe60),

		.flags  = IORESOURCE_IRQ,

       },

};
@@ -113,8 +114,8 @@ static struct resource iic1_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 44,

		.end    = 47,

		.start  = evt2irq(0x780),

		.end    = evt2irq(0x7e0),

		.flags  = IORESOURCE_IRQ,

       },

};
@@ -129,7 +130,7 @@ static struct platform_device iic1_device = { 
static struct uio_info vpu_platform_data = {

	.name = "VPU4",

	.version = "0",

	.irq = 60,

	.irq = evt2irq(0x980),

};



static struct resource vpu_resources[] = {
@@ -157,7 +158,7 @@ static struct platform_device vpu_device = { 
static struct uio_info veu_platform_data = {

	.name = "VEU",

	.version = "0",

	.irq = 54,

	.irq = evt2irq(0x8c0),

};



static struct resource veu_resources[] = {
@@ -185,7 +186,7 @@ static struct platform_device veu_device = { 
static struct uio_info jpu_platform_data = {

	.name = "JPU",

	.version = "0",

	.irq = 27,

	.irq = evt2irq(0x560),

};



static struct resource jpu_resources[] = {
@@ -224,7 +225,7 @@ static struct resource cmt_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 104,

		.start	= evt2irq(0xf00),

		.flags	= IORESOURCE_IRQ,

	},

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

	},

	[1] = {

		.start	= 16,

		.start	= evt2irq(0x400),

		.flags	= IORESOURCE_IRQ,

	},

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

	},

	[1] = {

		.start	= 17,

		.start	= evt2irq(0x420),

		.flags	= IORESOURCE_IRQ,

	},

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

	},

	[1] = {

		.start	= 18,

		.start	= evt2irq(0x440),

		.flags	= IORESOURCE_IRQ,

	},

};