From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 24 Mar 2016 13:32:39 +0000 (+0900)
Subject: clk: uniphier: use devm_get_addr() to get base address
X-Git-Tag: v2016.05-rc1~114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45a3b1fd6ca524bebf5b9ce771ad1fb12f3514ce;p=oweals%2Fu-boot.git

clk: 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/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index e79e0ff689..25c163b395 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -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;