]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
clk: uniphier: use devm_get_addr() to get base address
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 24 Mar 2016 13:32:39 +0000 (22:32 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 31 Mar 2016 15:17:08 +0000 (00:17 +0900)
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>
drivers/clk/uniphier/clk-uniphier-core.c

index e79e0ff689fdcd8312ec9b15dd67cb0cf6c29269..25c163b395dd2058c3e43e89423c560cd182ab3c 100644 (file)
@@ -8,13 +8,12 @@
 #include <mapmem.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/sizes.h>
 #include <clk.h>
 #include <dm/device.h>
 
 #include "clk-uniphier.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static int uniphier_clk_enable(struct udevice *dev, int index)
 {
        struct uniphier_clk_priv *priv = dev_get_priv(dev);
@@ -133,14 +132,12 @@ int uniphier_clk_probe(struct udevice *dev)
 {
        struct uniphier_clk_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
-       fdt_size_t size;
 
-       addr = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg",
-                                   &size);
+       addr = dev_get_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
-       priv->base = map_sysmem(addr, size);
+       priv->base = map_sysmem(addr, SZ_4K);
        if (!priv->base)
                return -ENOMEM;