From: Michal Simek <michal.simek@amd.com>
Date: Wed, 23 Jul 2025 09:06:46 +0000 (+0200)
Subject: serial: uartlite: Use private data instead of platform
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e8a208f6f09c1719fe17b3208b5b239f42cf69;p=thirdparty%2Fu-boot.git

serial: uartlite: Use private data instead of platform

plat data should be used only in probe or of_to_plat to fill it information
from DT. Then in probe platform data should be stored in private structure
which should be used by the other driver functions.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/8d32af596f80a2220d9f5d7fb98476e6d2b5f303.1753261604.git.michal.simek@amd.com
---

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index eb234108746..00155aba5eb 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -35,6 +35,10 @@ struct uartlite_plat {
 	struct uartlite *regs;
 };
 
+struct uartlite_priv {
+	struct uartlite *regs;
+};
+
 static u32 uart_in32(void __iomem *addr)
 {
 	if (little_endian)
@@ -53,8 +57,8 @@ static void uart_out32(void __iomem *addr, u32 val)
 
 static int uartlite_serial_putc(struct udevice *dev, const char ch)
 {
-	struct uartlite_plat *plat = dev_get_plat(dev);
-	struct uartlite *regs = plat->regs;
+	struct uartlite_priv *priv = dev_get_priv(dev);
+	struct uartlite *regs = priv->regs;
 
 	if (uart_in32(&regs->status) & SR_TX_FIFO_FULL)
 		return -EAGAIN;
@@ -66,8 +70,8 @@ static int uartlite_serial_putc(struct udevice *dev, const char ch)
 
 static int uartlite_serial_getc(struct udevice *dev)
 {
-	struct uartlite_plat *plat = dev_get_plat(dev);
-	struct uartlite *regs = plat->regs;
+	struct uartlite_priv *priv = dev_get_priv(dev);
+	struct uartlite *regs = priv->regs;
 
 	if (!(uart_in32(&regs->status) & SR_RX_FIFO_VALID_DATA))
 		return -EAGAIN;
@@ -77,8 +81,8 @@ static int uartlite_serial_getc(struct udevice *dev)
 
 static int uartlite_serial_pending(struct udevice *dev, bool input)
 {
-	struct uartlite_plat *plat = dev_get_plat(dev);
-	struct uartlite *regs = plat->regs;
+	struct uartlite_priv *priv = dev_get_priv(dev);
+	struct uartlite *regs = priv->regs;
 
 	if (input)
 		return uart_in32(&regs->status) & SR_RX_FIFO_VALID_DATA;
@@ -89,9 +93,12 @@ static int uartlite_serial_pending(struct udevice *dev, bool input)
 static int uartlite_serial_probe(struct udevice *dev)
 {
 	struct uartlite_plat *plat = dev_get_plat(dev);
+	struct uartlite_priv *priv = dev_get_priv(dev);
 	struct uartlite *regs = plat->regs;
 	int ret;
 
+	priv->regs = regs;
+
 	uart_out32(&regs->control, 0);
 	uart_out32(&regs->control, ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX);
 	ret = uart_in32(&regs->status);
@@ -131,6 +138,7 @@ U_BOOT_DRIVER(serial_uartlite) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = uartlite_serial_ids,
 	.of_to_plat = uartlite_serial_of_to_plat,
+	.priv_auto	= sizeof(struct uartlite_priv),
 	.plat_auto	= sizeof(struct uartlite_plat),
 	.probe = uartlite_serial_probe,
 	.ops	= &uartlite_serial_ops,