remoteproc: migrate uclass to livetree
authorPatrick Delaunay <patrick.delaunay@foss.st.com>
Mon, 20 Sep 2021 15:56:06 +0000 (17:56 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 5 Oct 2021 12:50:15 +0000 (08:50 -0400)
Use dev_ function to read the name and boolean to support a live tree.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/remoteproc/rproc-uclass.c

index 64c47c1..87e1ec7 100644 (file)
@@ -9,19 +9,15 @@
 #define pr_fmt(fmt) "%s: " fmt, __func__
 #include <common.h>
 #include <errno.h>
-#include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
 #include <remoteproc.h>
-#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 #include <dm.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /**
  * for_each_remoteproc_device() - iterate through the list of rproc devices
  * @fn: check function to call per match, if this function returns fail,
@@ -121,21 +117,13 @@ static int rproc_pre_probe(struct udevice *dev)
 
        if (!dev_get_plat(dev)) {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-               int node = dev_of_offset(dev);
-               const void *blob = gd->fdt_blob;
                bool tmp;
-               if (!blob) {
-                       debug("'%s' no dt?\n", dev->name);
-                       return -EINVAL;
-               }
                debug("'%s': using fdt\n", dev->name);
-               uc_pdata->name = fdt_getprop(blob, node,
-                                            "remoteproc-name", NULL);
+               uc_pdata->name = dev_read_string(dev, "remoteproc-name");
 
                /* Default is internal memory mapped */
                uc_pdata->mem_type = RPROC_INTERNAL_MEMORY_MAPPED;
-               tmp = fdtdec_get_bool(blob, node,
-                                     "remoteproc-internal-memory-mapped");
+               tmp = dev_read_bool(dev, "remoteproc-internal-memory-mapped");
                if (tmp)
                        uc_pdata->mem_type = RPROC_INTERNAL_MEMORY_MAPPED;
 #else