Prepare v2023.10

[platform/kernel/u-boot.git] / drivers / serial / serial_xuartlite.c

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 236ab86..b6197da 100644 (file)
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -32,7 +32,7 @@ struct uartlite {
        unsigned int control;
 };
 
-struct uartlite_platdata {
+struct uartlite_plat {
        struct uartlite *regs;
 };
 
@@ -54,7 +54,7 @@ static void uart_out32(void __iomem *addr, u32 val)
 
 static int uartlite_serial_putc(struct udevice *dev, const char ch)
 {
-       struct uartlite_platdata *plat = dev_get_platdata(dev);
+       struct uartlite_plat *plat = dev_get_plat(dev);
        struct uartlite *regs = plat->regs;
 
        if (uart_in32(&regs->status) & SR_TX_FIFO_FULL)
@@ -67,7 +67,7 @@ static int uartlite_serial_putc(struct udevice *dev, const char ch)
 
 static int uartlite_serial_getc(struct udevice *dev)
 {
-       struct uartlite_platdata *plat = dev_get_platdata(dev);
+       struct uartlite_plat *plat = dev_get_plat(dev);
        struct uartlite *regs = plat->regs;
 
        if (!(uart_in32(&regs->status) & SR_RX_FIFO_VALID_DATA))
@@ -78,7 +78,7 @@ static int uartlite_serial_getc(struct udevice *dev)
 
 static int uartlite_serial_pending(struct udevice *dev, bool input)
 {
-       struct uartlite_platdata *plat = dev_get_platdata(dev);
+       struct uartlite_plat *plat = dev_get_plat(dev);
        struct uartlite *regs = plat->regs;
 
        if (input)
@@ -89,7 +89,7 @@ static int uartlite_serial_pending(struct udevice *dev, bool input)
 
 static int uartlite_serial_probe(struct udevice *dev)
 {
-       struct uartlite_platdata *plat = dev_get_platdata(dev);
+       struct uartlite_plat *plat = dev_get_plat(dev);
        struct uartlite *regs = plat->regs;
        int ret;
 
@@ -106,9 +106,9 @@ static int uartlite_serial_probe(struct udevice *dev)
        return 0;
 }
 
-static int uartlite_serial_ofdata_to_platdata(struct udevice *dev)
+static int uartlite_serial_of_to_plat(struct udevice *dev)
 {
-       struct uartlite_platdata *plat = dev_get_platdata(dev);
+       struct uartlite_plat *plat = dev_get_plat(dev);
 
        plat->regs = dev_read_addr_ptr(dev);
 
@@ -131,8 +131,8 @@ U_BOOT_DRIVER(serial_uartlite) = {
        .name   = "serial_uartlite",
        .id     = UCLASS_SERIAL,
        .of_match = uartlite_serial_ids,
-       .ofdata_to_platdata = uartlite_serial_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
+       .of_to_plat = uartlite_serial_of_to_plat,
+       .plat_auto      = sizeof(struct uartlite_plat),
        .probe = uartlite_serial_probe,
        .ops    = &uartlite_serial_ops,
 };
@@ -143,12 +143,12 @@ U_BOOT_DRIVER(serial_uartlite) = {
 
 static inline void _debug_uart_init(void)
 {
-       struct uartlite *regs = (struct uartlite *)CONFIG_DEBUG_UART_BASE;
+       struct uartlite *regs = (struct uartlite *)CONFIG_VAL(DEBUG_UART_BASE);
        int ret;
 
        uart_out32(&regs->control, 0);
        uart_out32(&regs->control, ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX);
-       uart_in32(&regs->status);
+       ret = uart_in32(&regs->status);
        /* Endianness detection */
        if ((ret & SR_TX_FIFO_EMPTY) != SR_TX_FIFO_EMPTY) {
                little_endian = true;
@@ -159,7 +159,7 @@ static inline void _debug_uart_init(void)
 
 static inline void _debug_uart_putc(int ch)
 {
-       struct uartlite *regs = (struct uartlite *)CONFIG_DEBUG_UART_BASE;
+       struct uartlite *regs = (struct uartlite *)CONFIG_VAL(DEBUG_UART_BASE);
 
        while (uart_in32(&regs->status) & SR_TX_FIFO_FULL)
                ;