sh: sh7750 evt2irq migration. (20688c30) · Commits · git / linux-net

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/serial.h>
		#include <linux/io.h>
		#include <linux/sh_timer.h>
		#include <linux/sh_intc.h>
		#include <linux/serial_sci.h>
		#include <generated/machtypes.h>

		@@ -24,7 +25,7 @@ static struct resource rtc_resources[] = {
		},
		[1] = {
		/* Shared Period/Carry/Alarm IRQ */
		.start = 20,
		.start = evt2irq(0x480),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -43,7 +44,7 @@ static struct plat_sci_port sci_platform_data = {
		.scscr = SCSCR_TE \| SCSCR_RE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCI,
		.irqs = { 23, 23, 23, 0 },
		.irqs = SCIx_IRQ_MUXED(evt2irq(0x4e0)),
		.regshift = 2,
		};

		@@ -61,7 +62,7 @@ static struct plat_sci_port scif_platform_data = {
		.scscr = SCSCR_TE \| SCSCR_RE \| SCSCR_REIE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCIF,
		.irqs = { 40, 40, 40, 40 },
		.irqs = SCIx_IRQ_MUXED(evt2irq(0x700)),
		};

		static struct platform_device scif_device = {
		@@ -85,7 +86,7 @@ static struct resource tmu0_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 16,
		.start = evt2irq(0x400),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -113,7 +114,7 @@ static struct resource tmu1_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 17,
		.start = evt2irq(0x420),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -140,7 +141,7 @@ static struct resource tmu2_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 18,
		.start = evt2irq(0x440),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -172,7 +173,7 @@ static struct resource tmu3_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 72,
		.start = evt2irq(0xb00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -199,7 +200,7 @@ static struct resource tmu4_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 76,
		.start = evt2irq(0xb80),
		.flags = IORESOURCE_IRQ,
		},
		};