diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-28 17:50:07 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-12-13 07:58:18 -0700 |
| commit | d0c20ce6bcb9af3d70ed6ada618607ca1099e811 (patch) | |
| tree | bc04f32a35dfd54b571512fa792085130d228ed4 | |
| parent | e80be7493412e0facbbf81f709dc44740e975dea (diff) | |
| download | u-boot-d0c20ce6bcb9af3d70ed6ada618607ca1099e811.tar.gz | |
dm: core: Add an ofnode function to get the devicetree root
This is needed in at least one place. Avoid the conditional code in root.c
by adding this inline function.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/root.c | 8 | ||||
| -rw-r--r-- | include/dm/ofnode.h | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 5f10d7a39c..9ee65504e6 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -147,12 +147,8 @@ int dm_init(bool of_live) ret = device_bind_by_name(NULL, false, &root_info, &DM_ROOT_NON_CONST); if (ret) return ret; -#if CONFIG_IS_ENABLED(OF_CONTROL) - if (CONFIG_IS_ENABLED(OF_LIVE) && of_live) - DM_ROOT_NON_CONST->node = np_to_ofnode(gd_of_root()); - else - DM_ROOT_NON_CONST->node = offset_to_ofnode(0); -#endif + if (CONFIG_IS_ENABLED(OF_CONTROL)) + DM_ROOT_NON_CONST->node = ofnode_root(); ret = device_probe(DM_ROOT_NON_CONST); if (ret) return ret; diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index ee8c44a71e..53f04ac91d 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -218,6 +218,18 @@ static inline ofnode ofnode_null(void) return node; } +static inline ofnode ofnode_root(void) +{ + ofnode node; + + if (of_live_active()) + node.np = gd_of_root(); + else + node.of_offset = 0; + + return node; +} + /** * ofnode_read_u32() - Read a 32-bit integer from a property * |