mmc: uniphier: use devm_get_addr() to get base address

Currently, fdtdec_get_addr_size() does not support the address
translation, so it cannot handle device trees with non-straight
"ranges" properties.  (This would be a problem with DTS for UniPhier
ARMv8 SoCs.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 3bc4d942a03439b137b8b3dc3e0d0b48fb2e78fa..81a80cdbc2ca98728a28ea8466b4bd9c8dfb6bd9 100644 (file)
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -12,6 +12,7 @@
 #include <dm/device.h>
 #include <linux/compat.h>
 #include <linux/io.h>
+#include <linux/sizes.h>
 #include <asm/unaligned.h>
 #include <asm/dma-mapping.h>
 
@@ -650,15 +651,17 @@ int uniphier_sd_probe(struct udevice *dev)
        struct uniphier_sd_priv *priv = dev_get_priv(dev);
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        fdt_addr_t base;
-       fdt_size_t size;
        struct udevice *clk_dev;
        int clk_id;
        int ret;
 
        priv->dev = dev;
 
-       base = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg", &size);
-       priv->regbase = map_sysmem(base, size);
+       base = dev_get_addr(dev);
+       if (base == FDT_ADDR_T_NONE)
+               return -EINVAL;
+
+       priv->regbase = map_sysmem(base, SZ_2K);
        if (!priv->regbase)
                return -ENOMEM;