[U-Boot] [PATCH] dm: ofnode: query correct property in livetree ofnode_get_addr_size

[U-Boot] [PATCH] dm: ofnode: query correct property in livetree ofnode_get_addr_size

[Klaus Goger]

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 <klaus.goger@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

---

 drivers/core/ofnode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
-- 
2.11.0

[U-Boot] [PATCH] dm: ofnode: query correct property in livetree ofnode_get_addr_size

[Simon Glass]

On 20 September 2017 at 05:50, Klaus Goger
<klaus.goger@theobroma-systems.com> wrote:
> 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 <klaus.goger@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>
> ---
>
>  drivers/core/ofnode.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] dm: ofnode: query correct property in livetree ofnode_get_addr_size

[sjg at google.com]

On 20 September 2017 at 05:50, Klaus Goger
<klaus.goger@theobroma-systems.com> wrote:
> 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 <klaus.goger@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>
> ---
>
>  drivers/core/ofnode.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm thanks!