gpio: uniphier: use devm_get_addr() to get base address
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 24 Mar 2016 13:32:41 +0000 (22:32 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 31 Mar 2016 15:17:19 +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/gpio/gpio-uniphier.c

index 80bb16ec064227def48a5d2c05ad01e49cf31572..bde51eab15bb1f561bb4eaacfcc939dceddba10c 100644 (file)
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/sizes.h>
 #include <asm/errno.h>
 #include <asm/gpio.h>
 
@@ -91,17 +92,14 @@ static int uniphier_gpio_probe(struct udevice *dev)
 {
        struct uniphier_gpio_priv *priv = dev_get_priv(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-       DECLARE_GLOBAL_DATA_PTR;
        fdt_addr_t addr;
-       fdt_size_t size;
        unsigned int tmp;
 
-       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_8);
        if (!priv->base)
                return -ENOMEM;