rockchip: mmc: dm: convert fdt_get to dev_read

With the new dev_read functions available, we can convert the rockchip
architecture-specific drivers and common drivers used by these devices
over to the dev_read family of calls.

This covers the dw_mmc and sdhci wrapper drivers for Rockchip.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index 25a21e29d00aa9d0079426a6b3534b0c7257c1f3..24754b7b120e38a730c34dc5cf6d5cdb022d78ee 100644 (file)
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -59,32 +59,28 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
 
        host->name = dev->name;
        host->ioaddr = (void *)devfdt_get_addr(dev);
-       host->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                                       "bus-width", 4);
+       host->buswidth = dev_read_u32_default(dev, "bus-width", 4);
        host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk;
        host->priv = dev;
 
        /* use non-removeable as sdcard and emmc as judgement */
-       if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), "non-removable"))
+       if (dev_read_bool(dev, "non-removable"))
                host->dev_index = 0;
        else
                host->dev_index = 1;
 
-       priv->fifo_depth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                                   "fifo-depth", 0);
+       priv->fifo_depth = dev_read_u32_default(dev, "fifo-depth", 0);
+
        if (priv->fifo_depth < 0)
                return -EINVAL;
-       priv->fifo_mode = fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev),
-                                         "fifo-mode");
+       priv->fifo_mode = dev_read_bool(dev, "fifo-mode");
 
        /*
         * 'clock-freq-min-max' is deprecated
         * (see https://github.com/torvalds/linux/commit/b023030f10573de738bbe8df63d43acab64c9f7b)
         */
-       if (fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev),
-                                "clock-freq-min-max", priv->minmax, 2)) {
-               int val = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                                         "max-frequency", -EINVAL);
+       if (dev_read_u32_array(dev, "clock-freq-min-max", priv->minmax, 2)) {
+               int val = dev_read_u32_default(dev, "max-frequency", -EINVAL);
 
                if (val < 0)
                        return val;

diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 8985878d7e8837eabe46ac1f902e5645c8ddee9c..f31d329c81da7e7ad4e9269ae7203d5fc62284c6 100644 (file)
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -50,8 +50,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
        max_frequency = dtplat->max_frequency;
        ret = clk_get_by_index_platdata(dev, 0, dtplat->clocks, &clk);
 #else
-       max_frequency = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-                       "max-frequency", 0);
+       max_frequency = dev_read_u32_default(dev, "max-frequency", 0);
        ret = clk_get_by_index(dev, 0, &clk);
 #endif
        if (!ret) {