From 50a14db52c4115e903fbc62941d9d8e3930c5e3b Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 10 Feb 2016 12:46:23 +0100 Subject: [PATCH] fdt: Try to read address-cells/size-cells from parent Read address-cells and size-cells from parent if they are not present in current node. Signed-off-by: Michal Simek --- lib/libfdt/fdt_addresses.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libfdt/fdt_addresses.c b/lib/libfdt/fdt_addresses.c index 76054d98e5f..b164d098807 100644 --- a/lib/libfdt/fdt_addresses.c +++ b/lib/libfdt/fdt_addresses.c @@ -19,10 +19,15 @@ int fdt_address_cells(const void *fdt, int nodeoffset) const fdt32_t *ac; int val; int len; + int parent; ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len); - if (!ac) - return 2; + if (!ac) { + parent = fdt_parent_offset(fdt, nodeoffset); + ac = fdt_getprop(fdt, parent, "#address-cells", &len); + if (!ac) + return 2; + } if (len != sizeof(*ac)) return -FDT_ERR_BADNCELLS; @@ -39,10 +44,15 @@ int fdt_size_cells(const void *fdt, int nodeoffset) const fdt32_t *sc; int val; int len; + int parent; sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len); - if (!sc) - return 2; + if (!sc) { + parent = fdt_parent_offset(fdt, nodeoffset); + sc = fdt_getprop(fdt, parent, "#size-cells", &len); + if (!sc) + return 2; + } if (len != sizeof(*sc)) return -FDT_ERR_BADNCELLS; -- 2.47.3