[DO NOT MERGE v8 20/36] serial: sh-sci: fix SH4 OF support.

[John Paul Adrian Glaubitz]

Hi Yoshinori,

On Wed, 2024-05-29 at 17:01 +0900, Yoshinori Sato wrote:
> - Separated RZ's earlycon initialization from normal SCIF.
> - fix earlyprintk hung (NULL pointer reference).
> - fix SERIAL_SH_SCI_EARLYCON enablement

I feel like this could actually be split into three patches.

Adrian

> Signed-off-by: Yoshinori Sato <ysato at users.sourceforge.jp>
> Reviewed-by: Geert Uytterhoeven <geert+renesas at glider.be>
> ---
>  drivers/tty/serial/Kconfig  | 2 +-
>  drivers/tty/serial/sh-sci.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 4fdd7857ef4d..eeb22b582470 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -664,7 +664,7 @@ config SERIAL_SH_SCI_EARLYCON
>  	depends on SERIAL_SH_SCI=y
>  	select SERIAL_CORE_CONSOLE
>  	select SERIAL_EARLYCON
> -	default ARCH_RENESAS
> +	default ARCH_RENESAS || SUPERH
>  
>  config SERIAL_SH_SCI_DMA
>  	bool "DMA support" if EXPERT
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index f738980a8b2c..068f483401e3 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -2723,7 +2723,7 @@ static int sci_remap_port(struct uart_port *port)
>  	if (port->membase)
>  		return 0;
>  
> -	if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
> +	if (dev_of_node(port->dev) || (port->flags & UPF_IOREMAP)) {
>  		port->membase = ioremap(port->mapbase, sport->reg_size);
>  		if (unlikely(!port->membase)) {
>  			dev_err(port->dev, "can't remap port#%d\n", port->line);
> @@ -3551,8 +3551,8 @@ static int __init hscif_early_console_setup(struct earlycon_device *device,
>  
>  OF_EARLYCON_DECLARE(sci, "renesas,sci", sci_early_console_setup);
>  OF_EARLYCON_DECLARE(scif, "renesas,scif", scif_early_console_setup);
> -OF_EARLYCON_DECLARE(scif, "renesas,scif-r7s9210", rzscifa_early_console_setup);
> -OF_EARLYCON_DECLARE(scif, "renesas,scif-r9a07g044", rzscifa_early_console_setup);
> +OF_EARLYCON_DECLARE(rzscifa, "renesas,scif-r7s9210", rzscifa_early_console_setup);
> +OF_EARLYCON_DECLARE(rzscifa, "renesas,scif-r9a07g044", rzscifa_early_console_setup);
>  OF_EARLYCON_DECLARE(scifa, "renesas,scifa", scifa_early_console_setup);
>  OF_EARLYCON_DECLARE(scifb, "renesas,scifb", scifb_early_console_setup);
>  OF_EARLYCON_DECLARE(hscif, "renesas,hscif", hscif_early_console_setup);

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913