From: Klaus Goger Date: Wed, 20 Sep 2017 11:50:41 +0000 (+0200) Subject: dm: ofnode: query correct property in livetree ofnode_get_addr_size X-Git-Tag: v2017.11-rc2~62^2~1 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=68a345294ac74505f17d65b003a7de836b3d9cba;p=oweals%2Fu-boot.git dm: ofnode: query correct property in livetree ofnode_get_addr_size The livetree codepath of ofnode_get_addr_size always used the "reg" property for of_get_property. Use the property parameter of the function call instead and check the return value if the property exists. Otherwise return FDT_ADDR_T_NONE. This was discoverd while using SPI NOR with livetree. spi_flash_decode_fdt checks for memory-map and will not fail with livetree even if the property does not exist. Signed-off-by: Klaus Goger Reviewed-by: Philipp Tomsich Reviewed-by: Simon Glass --- diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index c6ca13fabf..0030ab962e 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -468,8 +468,10 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property, int na, ns; int psize; const struct device_node *np = ofnode_to_np(node); - const __be32 *prop = of_get_property(np, "reg", &psize); + const __be32 *prop = of_get_property(np, property, &psize); + if (!prop) + return FDT_ADDR_T_NONE; na = of_n_addr_cells(np); ns = of_n_addr_cells(np); *sizep = of_read_number(prop + na, ns);