RE: [PATCH 1/2] Revert "serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE"

[Chris Brandt]

On Thursday, August 30, 2018, Geert Uytterhoeven wrote:
> This reverts commit 7acece71a517cad83a0842a94d94c13f271b680c.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>


Acked-by: Chris Brandt <chris.brandt@xxxxxxxxxxx>



> ---
>  drivers/tty/serial/sh-sci.c | 31 +++++++++++++++++++++++++++++++
>  include/linux/serial_sci.h  |  1 +
>  2 files changed, 32 insertions(+)
> 
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index ac4424bf6b136cc4..5d42c9a63001575a 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -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",
> diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
> index c0e795d95477daea..1c89611e0e0634ae 100644
> --- a/include/linux/serial_sci.h
> +++ b/include/linux/serial_sci.h
> @@ -36,6 +36,7 @@ enum {
>  	SCIx_SH4_SCIF_FIFODATA_REGTYPE,
>  	SCIx_SH7705_SCIF_REGTYPE,
>  	SCIx_HSCIF_REGTYPE,
> +	SCIx_RZ_SCIFA_REGTYPE,
> 
>  	SCIx_NR_REGTYPES,
>  };
> --
> 2.17.1