LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <klaus.goger@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Klaus Goger 2017-09-20 13:50:41 +02:00 committed by Simon Glass
parent 5924da1dfe
commit 68a345294a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/core/ofnode.c
View File

@ -468,8 +468,10 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property,
int na, ns; int na, ns;
int psize; int psize;
const struct device_node *np = ofnode_to_np(node); 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); na = of_n_addr_cells(np);
ns = of_n_addr_cells(np); ns = of_n_addr_cells(np);
*sizep = of_read_number(prop + na, ns); *sizep = of_read_number(prop + na, ns);