Commit 10c63443 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

Revert "serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE" 



This reverts commit 7acece71.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarChris Brandt <chris.brandt@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcfed1be

drivers/tty/serial/sh-sci.c

+31 −0
Original line number Diff line number Diff line
@@ -291,6 +291,33 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = { 
		.error_clear = SCIF_ERROR_CLEAR,

	},



	/*

	 * The "SCIFA" that is in RZ/T and RZ/A2.

	 * It looks like a normal SCIF with FIFO data, but with a

	 * compressed address space. Also, the break out of interrupts

	 * are different: ERI/BRI, RXI, TXI, TEI, DRI.

	 */

	[SCIx_RZ_SCIFA_REGTYPE] = {

		.regs = {

			[SCSMR]		= { 0x00, 16 },

			[SCBRR]		= { 0x02,  8 },

			[SCSCR]		= { 0x04, 16 },

			[SCxTDR]	= { 0x06,  8 },

			[SCxSR]		= { 0x08, 16 },

			[SCxRDR]	= { 0x0A,  8 },

			[SCFCR]		= { 0x0C, 16 },

			[SCFDR]		= { 0x0E, 16 },

			[SCSPTR]	= { 0x10, 16 },

			[SCLSR]		= { 0x12, 16 },

		},

		.fifosize = 16,

		.overrun_reg = SCLSR,

		.overrun_mask = SCLSR_ORER,

		.sampling_rate_mask = SCI_SR(32),

		.error_mask = SCIF_DEFAULT_ERROR_MASK,

		.error_clear = SCIF_ERROR_CLEAR,

	},



	/*

	 * Common SH-3 SCIF definitions.

	 */
@@ -3110,6 +3137,10 @@ static const struct of_device_id of_sci_match[] = { 
		.compatible = "renesas,scif-r7s72100",

		.data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE),

	},

	{

		.compatible = "renesas,scif-r7s9210",

		.data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE),

	},

	/* Family-specific types */

	{

		.compatible = "renesas,rcar-gen1-scif",

include/linux/serial_sci.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum { 
	SCIx_SH4_SCIF_FIFODATA_REGTYPE,

	SCIx_SH7705_SCIF_REGTYPE,

	SCIx_HSCIF_REGTYPE,

	SCIx_RZ_SCIFA_REGTYPE,



	SCIx_NR_REGTYPES,

};