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

index edb9203858814bd41f8d2460c3c702e59137b5d6..525f0a441754efef2fe5e62f0cf30b139a4b4bd4 100644 (file)
@@ -6,6 +6,7 @@
 
 #include <linux/io.h>
 #include <linux/serial_reg.h>
+#include <linux/sizes.h>
 #include <asm/errno.h>
 #include <dm/device.h>
 #include <mapmem.h>
@@ -91,12 +92,13 @@ static int uniphier_serial_probe(struct udevice *dev)
        struct uniphier_serial_private_data *priv = dev_get_priv(dev);
        struct uniphier_serial __iomem *port;
        fdt_addr_t base;
-       fdt_size_t size;
        u32 tmp;
 
-       base = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg", &size);
+       base = dev_get_addr(dev);
+       if (base == FDT_ADDR_T_NONE)
+               return -EINVAL;
 
-       port = map_sysmem(base, size);
+       port = map_sysmem(base, SZ_64);
        if (!port)
                return -ENOMEM;