diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-03-24 22:32:38 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-01 00:17:07 +0900 |
| commit | b37a1ccea22d4c700589f716d46dbe4a3c268db1 (patch) | |
| tree | e0b280c362ac9aedd76b7639de72e8cc955575f4 /drivers/serial | |
| parent | 61a4f5bd61349b6ab2a4fed926aa203624f9494d (diff) | |
| download | blackbird-obmc-uboot-b37a1ccea22d4c700589f716d46dbe4a3c268db1.tar.gz blackbird-obmc-uboot-b37a1ccea22d4c700589f716d46dbe4a3c268db1.zip | |
serial: 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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_uniphier.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index edb9203858..525f0a4417 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -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; |
