aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-11 00:07:00 -0500
committerSimon Glass2018-11-14 11:16:27 -0600
commit8e39afcd942cdc52acaec33bce6b807b0dcc8cfe (patch)
tree6e5a4cf254ed5a43288136aa6555b4ccecb3ca99 /drivers
parent6244fc64ce9714373908111acf24f70f88c86b3e (diff)
downloadu-boot-8e39afcd942cdc52acaec33bce6b807b0dcc8cfe.tar.gz
u-boot-8e39afcd942cdc52acaec33bce6b807b0dcc8cfe.tar.xz
u-boot-8e39afcd942cdc52acaec33bce6b807b0dcc8cfe.zip
dm: core: Mirror the chosen node parse logic in the livetree scanning
Commit f2006808f099: ("dm: core: parse chosen node") added a logic to parse the chosen node during dm_scan_fdt_node(), but unfortunately it missed adding the same logic in dm_scan_fdt_live(). This mirrors the logic in the livetree version. The weird thing is that commit f2006808f099 did update the test case to test such logic, but even if I reset to that commit, the test case still fails, and I have no idea how it could pass. With this fix, the following 2 test cases now pass: Test: dm_test_bus_children: bus.c test/dm/bus.c:112, dm_test_bus_children(): num_devices == list_count_items(&uc->dev_head): Expected 7, got 6 Test: dm_test_fdt: test-fdt.c test/dm/test-fdt.c:184, dm_test_fdt(): num_devices == list_count_items(&uc->dev_head): Expected 7, got 6 Fixes: f2006808f099 ("dm: core: parse chosen node") Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/core/root.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c
index cd6a5a0276..4ce55f9cc8 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -222,6 +222,16 @@ static int dm_scan_fdt_live(struct udevice *parent,
222 int ret = 0, err; 222 int ret = 0, err;
223 223
224 for (np = node_parent->child; np; np = np->sibling) { 224 for (np = node_parent->child; np; np = np->sibling) {
225 /* "chosen" node isn't a device itself but may contain some: */
226 if (!strcmp(np->name, "chosen")) {
227 pr_debug("parsing subnodes of \"chosen\"\n");
228
229 err = dm_scan_fdt_live(parent, np, pre_reloc_only);
230 if (err && !ret)
231 ret = err;
232 continue;
233 }
234
225 if (!of_device_is_available(np)) { 235 if (!of_device_is_available(np)) {
226 pr_debug(" - ignoring disabled device\n"); 236 pr_debug(" - ignoring disabled device\n");
227 continue; 237 continue;