RE: [PATCH 2/2] Revert "serial: sh-sci: Allow for compressed SCIF address"

[Chris Brandt]

On Thursday, August 30, 2018, Geert Uytterhoeven wrote:
> This reverts commit 2d4dd0da45401c7ae7332b4d1eb7bbb1348edde9.
> 
> This broke earlycon on all Renesas ARM platforms using a SCIF port for
> the
> serial console (R-Car, RZ/A1, RZ/G1, RZ/G2 SoCs), due to an incorrect
> value
> of port->regshift.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>

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


> ---
>  drivers/tty/serial/sh-sci.c | 25 ++++++++++---------------
>  1 file changed, 10 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 5d42c9a63001575a..ab3f6e91853da3c2 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -346,15 +346,15 @@ static const struct sci_port_params
> sci_port_params[SCIx_NR_REGTYPES] = {
>  	[SCIx_SH4_SCIF_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 },
> +			[SCBRR]		= { 0x04,  8 },
> +			[SCSCR]		= { 0x08, 16 },
> +			[SCxTDR]	= { 0x0c,  8 },
> +			[SCxSR]		= { 0x10, 16 },
> +			[SCxRDR]	= { 0x14,  8 },
> +			[SCFCR]		= { 0x18, 16 },
> +			[SCFDR]		= { 0x1c, 16 },
> +			[SCSPTR]	= { 0x20, 16 },
> +			[SCLSR]		= { 0x24, 16 },
>  		},
>  		.fifosize = 16,
>  		.overrun_reg = SCLSR,
> @@ -2837,7 +2837,7 @@ static int sci_init_single(struct platform_device
> *dev,
>  {
>  	struct uart_port *port = &sci_port->port;
>  	const struct resource *res;
> -	unsigned int i, regtype;
> +	unsigned int i;
>  	int ret;
> 
>  	sci_port->cfg	= p;
> @@ -2874,7 +2874,6 @@ static int sci_init_single(struct platform_device
> *dev,
>  	if (unlikely(sci_port->params == NULL))
>  		return -EINVAL;
> 
> -	regtype = sci_port->params - sci_port_params;
>  	switch (p->type) {
>  	case PORT_SCIFB:
>  		sci_port->rx_trigger = 48;
> @@ -2929,10 +2928,6 @@ static int sci_init_single(struct platform_device
> *dev,
>  			port->regshift = 1;
>  	}
> 
> -	if (regtype == SCIx_SH4_SCIF_REGTYPE)
> -		if (sci_port->reg_size >= 0x20)
> -			port->regshift = 1;
> -
>  	/*
>  	 * The UART port needs an IRQ value, so we peg this to the RX IRQ
>  	 * for the multi-IRQ ports, which is where we are primarily
> --
> 2.17.1