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

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

sh: sh7763 evt2irq migration.



Migrate SH7763 to evt2irq() backed hwirq lookups.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f5bccdc0
Loading
Loading
Loading
Loading
+16 −14
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/sh_timer.h>
#include <linux/sh_intc.h>
#include <linux/io.h>
#include <linux/serial_sci.h>

@@ -22,7 +23,7 @@ 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		= { 40, 40, 40, 40 },
	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x700)),
	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

@@ -40,7 +41,7 @@ static struct plat_sci_port scif1_platform_data = {
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,
	.scbrr_algo_id	= SCBRR_ALGO_2,
	.type		= PORT_SCIF,
	.irqs		= { 76, 76, 76, 76 },
	.irqs		= SCIx_IRQ_MUXED(evt2irq(0xb80)),
	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

@@ -58,7 +59,7 @@ 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		= { 104, 104, 104, 104 },
	.irqs		= SCIx_IRQ_MUXED(evt2irq(0xf00)),
	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

@@ -78,7 +79,7 @@ static struct resource rtc_resources[] = {
	},
	[1] = {
		/* Shared Period/Carry/Alarm IRQ */
		.start  = 20,
		.start  = evt2irq(0x480),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -97,13 +98,14 @@ static struct resource usb_ohci_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 83,
		.end	= 83,
		.start	= evt2irq(0xc60),
		.end	= evt2irq(0xc60),
		.flags	= IORESOURCE_IRQ,
	},
};

static u64 usb_ohci_dma_mask = 0xffffffffUL;

static struct platform_device usb_ohci_device = {
	.name		= "sh_ohci",
	.id		= -1,
@@ -122,8 +124,8 @@ static struct resource usbf_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 84,
		.end	= 84,
		.start	= evt2irq(0xc80),
		.end	= evt2irq(0xc80),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -152,7 +154,7 @@ static struct resource tmu0_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 28,
		.start	= evt2irq(0x580),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -180,7 +182,7 @@ static struct resource tmu1_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 29,
		.start	= evt2irq(0x5a0),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -207,7 +209,7 @@ static struct resource tmu2_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 30,
		.start	= evt2irq(0x5c0),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -234,7 +236,7 @@ static struct resource tmu3_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 96,
		.start	= evt2irq(0xe00),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -261,7 +263,7 @@ static struct resource tmu4_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 97,
		.start	= evt2irq(0xe20),
		.flags	= IORESOURCE_IRQ,
	},
};
@@ -288,7 +290,7 @@ static struct resource tmu5_resources[] = {
		.flags	= IORESOURCE_MEM,
	},
	[1] = {
		.start	= 98,
		.start	= evt2irq(0xe40),
		.flags	= IORESOURCE_IRQ,
	},
};