treewide: Remove clk_free

[thirdparty/u-boot.git] / drivers / serial / serial_bcm6345.c

diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 9ad8c770d51e23084df21c192af2c4ead6b35a4e..13bc51725cdebe26f5326b7eb20e83efaf51d400 100644 (file)
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
+#include <malloc.h>
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/types.h>
@@ -238,7 +239,6 @@ static int bcm6345_serial_probe(struct udevice *dev)
        if (ret < 0)
                return ret;
        priv->uartclk = clk_get_rate(&clk);
-       clk_free(&clk);
 
        /* initialize serial */
        return bcm6345_serial_init(priv->base, priv->uartclk, CONFIG_BAUDRATE);
@@ -261,14 +261,14 @@ U_BOOT_DRIVER(bcm6345_serial) = {
        .id = UCLASS_SERIAL,
        .of_match = bcm6345_serial_ids,
        .probe = bcm6345_serial_probe,
-       .priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv),
+       .priv_auto      = sizeof(struct bcm6345_serial_priv),
        .ops = &bcm6345_serial_ops,
 };
 
 #ifdef CONFIG_DEBUG_UART_BCM6345
 static inline void _debug_uart_init(void)
 {
-       void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
+       void __iomem *base = (void __iomem *)CONFIG_VAL(DEBUG_UART_BASE);
 
        bcm6345_serial_init(base, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
 }
@@ -284,7 +284,7 @@ static inline void wait_xfered(void __iomem *base)
 
 static inline void _debug_uart_putc(int ch)
 {
-       void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE;
+       void __iomem *base = (void __iomem *)CONFIG_VAL(DEBUG_UART_BASE);
 
        wait_xfered(base);
        writel(ch, base + UART_FIFO_REG);