]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
serial: uartlite: Use private data instead of platform
authorMichal Simek <michal.simek@amd.com>
Wed, 23 Jul 2025 09:06:46 +0000 (11:06 +0200)
committerMichal Simek <michal.simek@amd.com>
Tue, 26 Aug 2025 05:30:09 +0000 (07:30 +0200)
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
drivers/serial/serial_xuartlite.c

index eb234108746d094a5bf5cbb6fc32a06c123f8d5f..00155aba5eb23a80305a8a73afe872af6b3489cc 100644 (file)
@@ -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,