Merge branches 'sh/core' and 'sh/serial-rework' into sh-fixes-for-linus (78b425fa) · Commits · e / devices / android_kernel_samsung_universal8890

arch/sh/kernel/cpu/sh2a/setup-sh7203.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -176,10 +176,12 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
		static struct plat_sci_port scif0_platform_data = {
		.mapbase = 0xfffe8000,
		.flags = UPF_BOOT_AUTOCONF,
		.scscr = SCSCR_RE \| SCSCR_TE \| SCSCR_REIE,
		.scscr = SCSCR_RIE \| SCSCR_TIE \| SCSCR_RE \| SCSCR_TE \|
		SCSCR_REIE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCIF,
		.irqs = { 192, 192, 192, 192 },
		.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
		};

		static struct platform_device scif0_device = {
		@@ -193,10 +195,12 @@ static struct platform_device scif0_device = {
		static struct plat_sci_port scif1_platform_data = {
		.mapbase = 0xfffe8800,
		.flags = UPF_BOOT_AUTOCONF,
		.scscr = SCSCR_RE \| SCSCR_TE \| SCSCR_REIE,
		.scscr = SCSCR_RIE \| SCSCR_TIE \| SCSCR_RE \| SCSCR_TE \|
		SCSCR_REIE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCIF,
		.irqs = { 196, 196, 196, 196 },
		.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
		};

		static struct platform_device scif1_device = {
		@@ -210,10 +214,12 @@ static struct platform_device scif1_device = {
		static struct plat_sci_port scif2_platform_data = {
		.mapbase = 0xfffe9000,
		.flags = UPF_BOOT_AUTOCONF,
		.scscr = SCSCR_RE \| SCSCR_TE \| SCSCR_REIE,
		.scscr = SCSCR_RIE \| SCSCR_TIE \| SCSCR_RE \| SCSCR_TE \|
		SCSCR_REIE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCIF,
		.irqs = { 200, 200, 200, 200 },
		.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
		};

		static struct platform_device scif2_device = {
		@@ -227,10 +233,12 @@ static struct platform_device scif2_device = {
		static struct plat_sci_port scif3_platform_data = {
		.mapbase = 0xfffe9800,
		.flags = UPF_BOOT_AUTOCONF,
		.scscr = SCSCR_RE \| SCSCR_TE \| SCSCR_REIE,
		.scscr = SCSCR_RIE \| SCSCR_TIE \| SCSCR_RE \| SCSCR_TE \|
		SCSCR_REIE,
		.scbrr_algo_id = SCBRR_ALGO_2,
		.type = PORT_SCIF,
		.irqs = { 204, 204, 204, 204 },
		.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
		};

		static struct platform_device scif3_device = {

drivers/tty/serial/sh-sci.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,25 @@ static struct plat_sci_reg sci_regmap[SCIx_NR_REGTYPES][SCIx_NR_REGS] = {
		[SCLSR] = sci_reg_invalid,
		},

		/*
		* Common SH-2(A) SCIF definitions for ports with FIFO data
		* count registers.
		*/
		[SCIx_SH2_SCIF_FIFODATA_REGTYPE] = {
		[SCSMR] = { 0x00, 16 },
		[SCBRR] = { 0x04, 8 },
		[SCSCR] = { 0x08, 16 },
		[SCxTDR] = { 0x0c, 8 },
		[SCxSR] = { 0x10, 16 },
		[SCxRDR] = { 0x14, 8 },
		[SCFCR] = { 0x18, 16 },
		[SCFDR] = { 0x1c, 16 },
		[SCTFDR] = sci_reg_invalid,
		[SCRFDR] = sci_reg_invalid,
		[SCSPTR] = { 0x20, 16 },
		[SCLSR] = { 0x24, 16 },
		},

		/*
		* Common SH-3 SCIF definitions.
		*/

include/linux/serial_sci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ enum {
		SCIx_IRDA_REGTYPE,
		SCIx_SCIFA_REGTYPE,
		SCIx_SCIFB_REGTYPE,
		SCIx_SH2_SCIF_FIFODATA_REGTYPE,
		SCIx_SH3_SCIF_REGTYPE,
		SCIx_SH4_SCIF_REGTYPE,
		SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,