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

[u-boot] / drivers / mmc / rockchip_dw_mmc.c

diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index d5b05b0b5832bce6b9e95f0133873ae8bb2a6d00..f54d95a881a52307d59660451f80183b9bc21780 100644 (file)
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -18,8 +17,6 @@
 #include <asm/arch/periph.h>
 #include <linux/err.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct rockchip_mmc_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
        struct dtd_rockchip_rk3288_dw_mshc dtplat;
@@ -44,7 +41,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
 
        ret = clk_set_rate(&priv->clk, freq);
        if (ret < 0) {
-               printf("%s: err=%d\n", __func__, ret);
+               debug("%s: err=%d\n", __func__, ret);
                return ret;
        }
 
@@ -58,7 +55,7 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
        struct dwmci_host *host = &priv->host;
 
        host->name = dev->name;
-       host->ioaddr = (void *)devfdt_get_addr(dev);
+       host->ioaddr = dev_read_addr_ptr(dev);
        host->buswidth = dev_read_u32_default(dev, "bus-width", 4);
        host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk;
        host->priv = dev;
@@ -122,7 +119,7 @@ static int rockchip_dwmmc_probe(struct udevice *dev)
        if (ret < 0)
                return ret;
 #else
-       ret = clk_get_by_name(dev, "ciu", &priv->clk);
+       ret = clk_get_by_index(dev, 0, &priv->clk);
        if (ret < 0)
                return ret;
 #endif