[PATCH v1 1/3] rockchip: serial: restyle the serial_rockchip.c driver

[PATCH v1 1/3] rockchip: serial: restyle the serial_rockchip.c driver

[Johan Jonker]

The ns16550.c driver has the following conditions for .of_match:

CONFIG_IS_ENABLED(OF_REAL)

For Rockchip SoCs with TPL/SPL and platform data that need serial
support the serial_rockchip.c driver was made. It copies this data
and then calls ns16550_serial_probe(). With the addition of yet an other
SoC type this driver is in need for a little restyle.
Simplify struct rockchip_uart_plat and add extra SoCs with
DM_DRIVER_ALIAS(). Return -ENODEV when the ns16550.c driver
probe function is available.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 drivers/serial/serial_rockchip.c | 36 +++++++++++++-------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index 97d40869..0d1d9fff 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -12,22 +12,19 @@
 #include <asm/arch-rockchip/clock.h>
 #include <dm/device-internal.h>
 
-#if defined(CONFIG_ROCKCHIP_RK3188)
-struct rockchip_uart_plat {
-	struct dtd_rockchip_rk3188_uart dtplat;
-	struct ns16550_plat plat;
-};
-struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat;
-#elif defined(CONFIG_ROCKCHIP_RK3288)
 struct rockchip_uart_plat {
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct dtd_rockchip_rk3288_uart dtplat;
+#endif
 	struct ns16550_plat plat;
 };
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat;
 #endif
 
 static int rockchip_serial_probe(struct udevice *dev)
 {
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
 	struct rockchip_uart_plat *plat = dev_get_plat(dev);
 
 	/* Create some new platform data for the standard driver */
@@ -38,24 +35,19 @@ static int rockchip_serial_probe(struct udevice *dev)
 	dev_set_plat(dev, &plat->plat);
 
 	return ns16550_serial_probe(dev);
+#else
+	return -ENODEV;
+#endif
 }
 
-U_BOOT_DRIVER(rockchip_rk3188_uart) = {
-	.name	= "rockchip_rk3188_uart",
-	.id	= UCLASS_SERIAL,
-	.priv_auto	= sizeof(struct ns16550),
-	.plat_auto	= sizeof(struct rockchip_uart_plat),
-	.probe	= rockchip_serial_probe,
-	.ops	= &ns16550_serial_ops,
-	.flags	= DM_FLAG_PRE_RELOC,
-};
-
 U_BOOT_DRIVER(rockchip_rk3288_uart) = {
-	.name	= "rockchip_rk3288_uart",
-	.id	= UCLASS_SERIAL,
+	.name		= "rockchip_rk3288_uart",
+	.id		= UCLASS_SERIAL,
 	.priv_auto	= sizeof(struct ns16550),
 	.plat_auto	= sizeof(struct rockchip_uart_plat),
-	.probe	= rockchip_serial_probe,
-	.ops	= &ns16550_serial_ops,
-	.flags	= DM_FLAG_PRE_RELOC,
+	.probe		= rockchip_serial_probe,
+	.ops		= &ns16550_serial_ops,
+	.flags		= DM_FLAG_PRE_RELOC,
 };
+DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3066_uart)
+DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3188_uart)
-- 
2.20.1

[PATCH v1 2/3] rockchip: serial: move driver alias to serial_rockchip.c

[Johan Jonker]

The Rockchip uart DT nodes have "snps,dw-apb-uart" as
fall back string. The driver ns16550.c has CONFIG_IS_ENABLED(OF_REAL)
as condition to of_match and does not copy dtplat data.
For TPL/SPL the driver serial_rockchip.c
is used. Move driver alias to correct driver.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 drivers/serial/ns16550.c         | 2 --
 drivers/serial/serial_rockchip.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 796ff165..a4220fd0 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -624,8 +624,6 @@ U_BOOT_DRIVER(ns16550_serial) = {
 #endif
 };
 
-DM_DRIVER_ALIAS(ns16550_serial, rockchip_rk3328_uart)
-DM_DRIVER_ALIAS(ns16550_serial, rockchip_rk3368_uart)
 DM_DRIVER_ALIAS(ns16550_serial, ti_da830_uart)
 #endif
 #endif /* SERIAL_PRESENT */
diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index 0d1d9fff..22c7ac90 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -51,3 +51,5 @@ U_BOOT_DRIVER(rockchip_rk3288_uart) = {
 };
 DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3066_uart)
 DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3188_uart)
+DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3328_uart)
+DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3368_uart)
-- 
2.20.1

[PATCH v1 3/3] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL

[Johan Jonker]

The Rockchip serial driver depends on an enabled NS16550 driver,
so add select SYS_NS16550 to config ROCKCHIP_SERIAL.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 drivers/serial/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6c8fdda9..054bd21e 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -737,6 +737,7 @@ config PL01X_SERIAL
 config ROCKCHIP_SERIAL
 	bool "Rockchip on-chip UART support"
 	depends on DM_SERIAL && SPL_OF_PLATDATA
+	select SYS_NS16550
 	help
 	  Select this to enable a debug UART for Rockchip devices when using
 	  CONFIG_SPL_OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
-- 
2.20.1

Re: [PATCH v1 1/3] rockchip: serial: restyle the serial_rockchip.c driver

[Simon Glass]

Hi Johan,

On Sun, 9 Jan 2022 at 08:26, Johan Jonker <jbx6244@gmail.com> wrote:
>
> The ns16550.c driver has the following conditions for .of_match:
>
> CONFIG_IS_ENABLED(OF_REAL)
>
> For Rockchip SoCs with TPL/SPL and platform data that need serial
> support the serial_rockchip.c driver was made. It copies this data
> and then calls ns16550_serial_probe(). With the addition of yet an other
> SoC type this driver is in need for a little restyle.
> Simplify struct rockchip_uart_plat and add extra SoCs with
> DM_DRIVER_ALIAS(). Return -ENODEV when the ns16550.c driver
> probe function is available.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  drivers/serial/serial_rockchip.c | 36 +++++++++++++-------------------
>  1 file changed, 14 insertions(+), 22 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v1 3/3] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL

[Simon Glass]

On Sun, 9 Jan 2022 at 08:26, Johan Jonker <jbx6244@gmail.com> wrote:
>
> The Rockchip serial driver depends on an enabled NS16550 driver,
> so add select SYS_NS16550 to config ROCKCHIP_SERIAL.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  drivers/serial/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v1 2/3] rockchip: serial: move driver alias to serial_rockchip.c

[Simon Glass]

On Sun, 9 Jan 2022 at 08:26, Johan Jonker <jbx6244@gmail.com> wrote:
>
> The Rockchip uart DT nodes have "snps,dw-apb-uart" as
> fall back string. The driver ns16550.c has CONFIG_IS_ENABLED(OF_REAL)
> as condition to of_match and does not copy dtplat data.
> For TPL/SPL the driver serial_rockchip.c
> is used. Move driver alias to correct driver.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  drivers/serial/ns16550.c         | 2 --
>  drivers/serial/serial_rockchip.c | 2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v1 3/3] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL

[Jagan Teki]

On Sun, Jan 9, 2022 at 8:56 PM Johan Jonker <jbx6244@gmail.com> wrote:
>
> The Rockchip serial driver depends on an enabled NS16550 driver,
> so add select SYS_NS16550 to config ROCKCHIP_SERIAL.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  drivers/serial/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index 6c8fdda9..054bd21e 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -737,6 +737,7 @@ config PL01X_SERIAL
>  config ROCKCHIP_SERIAL
>         bool "Rockchip on-chip UART support"
>         depends on DM_SERIAL && SPL_OF_PLATDATA
> +       select SYS_NS16550

Other places of rockchip code are implying and selecting the
SYS_NS16550, so removing those would be part of this global select.

Jagan.