rockchip: serial: restyle the serial_rockchip.c driver
PATCH 2/3 rockchip: serial: move driver alias to serial_rockchip.c
In reply to Johan JonkerThe 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.
--- drivers/serial/ns16550.c | 2 -- drivers/serial/serial_rockchip.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/serial/ns16550.c +0 -2
@@ -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 */
drivers/serial/serial_rockchip.c +2 -0
@@ -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)
Signature · 1 line
2.20.1
PATCH 3/3 rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL
In reply to Johan JonkerThe Rockchip serial driver depends on an enabled NS16550 driver, so add select SYS_NS16550 to config ROCKCHIP_SERIAL.
--- drivers/serial/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/serial/Kconfig +1 -0
@@ -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).
Signature · 1 line
2.20.1
PATCH 1/3 rockchip: serial: restyle the serial_rockchip.c driver
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.
--- drivers/serial/serial_rockchip.c | 36 +++++++++++++------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
drivers/serial/serial_rockchip.c +14 -22
@@ -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)
Signature · 1 line
2.20.1
Re: [PATCH v1 3/3] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL
In reply to Johan JonkerQuoted 9 lines · Johan Jonker
The Rockchip serial driver depends on an enabled NS16550 driver, so add select
SYS_NS16550to configROCKCHIP_SERIAL.Signed-off-by Johan Jonker <[email protected]>--- drivers/serial/Kconfig | 1 + 1 file changed, 1 insertion(+)
Re: [PATCH v1 2/3] rockchip: serial: move driver alias to serial_rockchip.c
In reply to Johan JonkerQuoted 7 lines · Johan Jonker
The Rockchip uart DT nodes have "snps,dw-apb-uart" as
fall back string. The driverns16550.chasCONFIG_IS_ENABLED(OF_REAL)as condition toof_matchand does not copy dtplat data. For TPL/SPL the driverserial_rockchip.c
is used. Move driver alias to correct driver.
Quoted 5 lines
Signed-off-by Johan Jonker <[email protected]>--- drivers/serial/ns16550.c | 2 -- drivers/serial/serial_rockchip.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
Hi Johan,
Quoted 13 lines · Johan Jonker
The
ns16550.cdriver 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.cdriver was made. It copies this data and then callsns16550_serial_probe(). With the addition of yet an other SoC type this driver is in need for a little restyle. Simplify structrockchip_uart_platand add extra SoCs withDM_DRIVER_ALIAS(). Return-ENODEVwhen thens16550.cdriver probe function is available.
Quoted 4 lines
Signed-off-by Johan Jonker <[email protected]>--- drivers/serial/serial_rockchip.c | 36 +++++++++++++------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
Re: [PATCH v1 3/3] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL
In reply to Johan JonkerQuoted 14 lines · Johan Jonker
The Rockchip serial driver depends on an enabled NS16550 driver, so add select
SYS_NS16550to configROCKCHIP_SERIAL.Signed-off-by Johan Jonker <[email protected]>--- drivers/serial/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/serial/Kconfig +0
-0
drivers/serial/Kconfig config PL01X_SERIAL · line 740
Quoted 4 lines
drivers/serial/Kconfig +1
-0@@ -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.