sh: sh7720 evt2irq migration. (85ee6b06) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sh/kernel/cpu/sh3/setup-sh7720.c

+17 −15

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/io.h>
		#include <linux/serial_sci.h>
		#include <linux/sh_timer.h>
		#include <linux/sh_intc.h>
		#include <asm/rtc.h>
		#include <cpu/serial.h>

		@@ -30,7 +31,7 @@ static struct resource rtc_resources[] = {
		},
		[1] = {
		/* Shared Period/Carry/Alarm IRQ */
		.start = 20,
		.start = evt2irq(0x480),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -55,7 +56,7 @@ static struct plat_sci_port scif0_platform_data = {
		.scscr = SCSCR_RE \| SCSCR_TE,
		.scbrr_algo_id = SCBRR_ALGO_4,
		.type = PORT_SCIF,
		.irqs = { 80, 80, 80, 80 },
		.irqs = SCIx_IRQ_MUXED(evt2irq(0xc00)),
		.ops = &sh7720_sci_port_ops,
		.regtype = SCIx_SH7705_SCIF_REGTYPE,
		};
		@@ -74,7 +75,7 @@ static struct plat_sci_port scif1_platform_data = {
		.scscr = SCSCR_RE \| SCSCR_TE,
		.scbrr_algo_id = SCBRR_ALGO_4,
		.type = PORT_SCIF,
		.irqs = { 81, 81, 81, 81 },
		.irqs = SCIx_IRQ_MUXED(evt2irq(0xc20)),
		.ops = &sh7720_sci_port_ops,
		.regtype = SCIx_SH7705_SCIF_REGTYPE,
		};
		@@ -94,13 +95,14 @@ static struct resource usb_ohci_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 67,
		.end = 67,
		.start = evt2irq(0xa60),
		.end = evt2irq(0xa60),
		.flags = IORESOURCE_IRQ,
		},
		};

		static u64 usb_ohci_dma_mask = 0xffffffffUL;

		static struct platform_device usb_ohci_device = {
		.name = "sh_ohci",
		.id = -1,
		@@ -121,8 +123,8 @@ static struct resource usbf_resources[] = {
		},
		[1] = {
		.name = "sh_udc",
		.start = 65,
		.end = 65,
		.start = evt2irq(0xa20),
		.end = evt2irq(0xa20),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -152,7 +154,7 @@ static struct resource cmt0_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 104,
		.start = evt2irq(0xf00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -179,7 +181,7 @@ static struct resource cmt1_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 104,
		.start = evt2irq(0xf00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -206,7 +208,7 @@ static struct resource cmt2_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 104,
		.start = evt2irq(0xf00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -233,7 +235,7 @@ static struct resource cmt3_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 104,
		.start = evt2irq(0xf00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -260,7 +262,7 @@ static struct resource cmt4_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 104,
		.start = evt2irq(0xf00),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -288,7 +290,7 @@ static struct resource tmu0_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 16,
		.start = evt2irq(0x400),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -316,7 +318,7 @@ static struct resource tmu1_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 17,
		.start = evt2irq(0x420),
		.flags = IORESOURCE_IRQ,
		},
		};
		@@ -343,7 +345,7 @@ static struct resource tmu2_resources[] = {
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = 18,
		.start = evt2irq(0x440),
		.flags = IORESOURCE_IRQ,
		},
		};