diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-15 07:25:16 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-22 09:23:28 +0300 |
| commit | 3fa9f553c0c0418b9abf93c2f33a44c98380beaf (patch) | |
| tree | a9a8b64005dcee9706af7e1400852cd4765864af | |
| parent | 1ef3af3b2717aba9db79879274ab5e1f1d7b2d25 (diff) | |
| download | u-boot-3fa9f553c0c0418b9abf93c2f33a44c98380beaf.tar.xz | |
dm: core: Adjust uclass setup with of-platdata
When OF_PLATDATA_INST is enabled we don't need to create the uclass list.
Instead we just need to point to the existing list. Update the code
accordingly.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/root.c | 8 | ||||
| -rw-r--r-- | include/dm/root.h | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 9bc682cffe..3feadb77b5 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -140,8 +140,12 @@ int dm_init(bool of_live) dm_warn("Virtual root driver already exists!\n"); return -EINVAL; } - gd->uclass_root = &DM_UCLASS_ROOT_S_NON_CONST; - INIT_LIST_HEAD(DM_UCLASS_ROOT_NON_CONST); + if (CONFIG_IS_ENABLED(OF_PLATDATA_INST)) { + gd->uclass_root = &uclass_head; + } else { + gd->uclass_root = &DM_UCLASS_ROOT_S_NON_CONST; + INIT_LIST_HEAD(DM_UCLASS_ROOT_NON_CONST); + } if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) { fix_drivers(); diff --git a/include/dm/root.h b/include/dm/root.h index 89afbee619..42510b106a 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -11,6 +11,9 @@ struct udevice; +/* Head of the uclass list if CONFIG_OF_PLATDATA_INST is enabled */ +extern struct list_head uclass_head; + /** * dm_root() - Return pointer to the top of the driver tree * |