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>

diff --git a/drivers/core/root.c b/drivers/core/root.c
index 9bc682cffea2c58f73b2e23699569d4af09ed0ca..3feadb77b56244a78cc92fd656ef4573b824fa62 100644 (file)
--- 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 89afbee619657690a884fb3a7e2b26b01d0e4946..42510b106abec51192ac70508bcf1ad03b05acaa 100644 (file)
--- 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
  *