Merge branch 'master' of git://git.denx.de/u-boot-i2c

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

diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index cb55c5ab7196a38b783b1ff9934ee22999cceb2b..faea6d4c995d3376eed1a11cd59beacca1b0e397 100644 (file)
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 SAMSUNG Electronics
  * Minkyu Kang <mk7.kang@samsung.com>
  * Heungjun Kim <riverful.kim@samsung.com>
  *
  * based on drivers/serial/s3c64xx.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -94,13 +93,13 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)
        u32 uclk;
 
 #ifdef CONFIG_CLK_EXYNOS
-       struct udevice *clk_dev;
+       struct clk clk;
        u32 ret;
 
-       ret = clk_get_by_index(dev, 1, &clk_dev);
+       ret = clk_get_by_index(dev, 1, &clk);
        if (ret < 0)
                return ret;
-       uclk = clk_get_periph_rate(clk_dev, ret);
+       uclk = clk_get_rate(&clk);
 #else
        uclk = get_uart_clk(plat->port_id);
 #endif
@@ -182,12 +181,12 @@ static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
        struct s5p_serial_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
-       addr = dev_get_addr(dev);
+       addr = devfdt_get_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
        plat->reg = (struct s5p_uart *)addr;
-       plat->port_id = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       plat->port_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                        "id", dev->seq);
        return 0;
 }