From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de,
peng.fan@nxp.com, jh80.chung@samsung.com, u-boot@lists.denx.de
Subject: [PATCH v5 13/13] rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL
Date: Sat, 9 Apr 2022 18:55:14 +0200 [thread overview]
Message-ID: <20220409165514.19220-14-jbx6244@gmail.com> (raw)
In-Reply-To: <20220409165514.19220-1-jbx6244@gmail.com>
The serial_rockchip.c driver converts platdata to the data structure
used in the ns16550.c file and then calls the function
ns16550_serial_probe().
When compiled with OF_REAL the serial_rockchip.c driver returns
now -ENODEV when probed and does no harm.
The config ROCKCHIP_SERIAL is currently depends on SPL_OF_PLATDATA.
Allow serial port use for both SPL and TPL by removing this
dependency and SPL_BUILD restriction.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
drivers/serial/Kconfig | 4 ++--
drivers/serial/Makefile | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 06a69e78de..9bf83b29ca 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -762,11 +762,11 @@ config PL01X_SERIAL
config ROCKCHIP_SERIAL
bool "Rockchip on-chip UART support"
- depends on DM_SERIAL && SPL_OF_PLATDATA
+ depends on DM_SERIAL
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).
+ OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
This uses the ns16550 driver, converting the platdata from of-platdata
to the ns16550 format.
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index b68b5e7b2b..d8e26d72ea 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -46,9 +46,7 @@ obj-$(CONFIG_MXC_UART) += serial_mxc.o
obj-$(CONFIG_PXA_SERIAL) += serial_pxa.o
obj-$(CONFIG_MESON_SERIAL) += serial_meson.o
obj-$(CONFIG_INTEL_MID_SERIAL) += serial_intel_mid.o
-ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_ROCKCHIP_SERIAL) += serial_rockchip.o
-endif
obj-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
obj-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
obj-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
--
2.20.1
next prev parent reply other threads:[~2022-04-09 16:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 16:55 [PATCH v5 00/13] Prepare RK3066 U-boot support Johan Jonker
2022-04-09 16:55 ` [PATCH v5 01/13] rockchip: move ROCKCHIP_STIMER_BASE to Kconfig Johan Jonker
2022-04-09 16:55 ` [PATCH v5 02/13] rockchip: spl: change call condition rockchip_stimer_init() Johan Jonker
2022-04-11 2:23 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 03/13] rockchip: tpl: " Johan Jonker
2022-04-11 2:23 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 04/13] rockchip: tpl: use IS_ENABLED for timer_init() call condition Johan Jonker
2022-04-09 16:55 ` [PATCH v5 05/13] rockchip: timer: add OF_PLATDATA support for dw-apb-timer Johan Jonker
2022-04-09 16:55 ` [PATCH v5 06/13] rockchip: timer: dw-apb-timer: fix whitespace in U_BOOT_DRIVER structure Johan Jonker
2022-04-09 16:55 ` [PATCH v5 07/13] rockchip: mmc: rockchip_dw_mmc: fix ciu clock index Johan Jonker
2022-04-09 16:55 ` [PATCH v5 08/13] rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support Johan Jonker
2022-04-11 2:24 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 09/13] rockchip: serial: restyle the serial_rockchip.c driver Johan Jonker
2022-04-09 16:55 ` [PATCH v5 10/13] rockchip: serial: move driver alias to serial_rockchip.c Johan Jonker
2022-04-09 16:55 ` [PATCH v5 11/13] rockchip: serial: rename U_BOOT_DRIVER name to rockchip_uart Johan Jonker
2022-04-11 2:25 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 12/13] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL Johan Jonker
2022-04-09 16:55 ` Johan Jonker [this message]
2022-04-11 2:26 ` [PATCH v5 13/13] rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220409165514.19220-14-jbx6244@gmail.com \
--to=jbx6244@gmail.com \
--cc=heiko@sntech.de \
--cc=jh80.chung@samsung.com \
--cc=kever.yang@rock-chips.com \
--cc=peng.fan@nxp.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox