Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / drivers / serial / serial_zynq.c

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 4f6e7e442fa2288f5e4d502302f9c5ac3ad0c968..4e86e5c2a1abef1a0d449b67d5a5af27e0d3b301 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -15,7 +15,6 @@
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <serial.h>
-#include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -111,7 +110,6 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate)
        struct zynq_uart_priv *priv = dev_get_priv(dev);
        unsigned long clock;
 
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
        int ret;
        struct clk clk;
 
@@ -133,9 +131,7 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate)
                dev_err(dev, "failed to enable clock\n");
                return ret;
        }
-#else
-       clock = get_uart_clk(0);
-#endif
+
        _uart_zynq_serial_setbrg(priv->regs, clock, baudrate);
 
        return 0;
@@ -183,7 +179,7 @@ static int zynq_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct zynq_uart_priv *priv = dev_get_priv(dev);
 
-       priv->regs = (struct uart_zynq *)dev_get_addr(dev);
+       priv->regs = (struct uart_zynq *)devfdt_get_addr(dev);
 
        return 0;
 }