dm: core: remove the duplicated function dm_ofnode_pre_reloc

The content dm_ofnode_pre_reloc() is identical with ofnode_pre_reloc()
defined in drivers/core/ofnode.c and used only three times:
- drivers/core/lists.c:lists_bind_fdt()
- drivers/clk/at91/pmc.c::at91_clk_sub_device_bind
- drivers/clk/altera/clk-arria10.c::socfpga_a10_clk_bind

So this function dm_ofnode_pre_reloc can be removed and replaced
by these function calls by ofnode_pre_reloc().

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index b7eed948a518164e5695a340818a47c1b39accc0..694a9427e1fde749cf9619e8c99f5ebe0d9c0f1c 100644 (file)
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -258,7 +258,7 @@ static int socfpga_a10_clk_bind(struct udevice *dev)
                        continue;
 
                if (pre_reloc_only &&
-                   !dm_ofnode_pre_reloc(offset_to_ofnode(offset)))
+                   !ofnode_pre_reloc(offset_to_ofnode(offset)))
                        continue;
 
                ret = device_bind_driver_to_node(dev, "clk-a10", name,

diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 6b55ec59d6dfdd6456e26ddb3cd38ef8d6d8f861..f5808449a629132300b7aae5104e651b15622783 100644 (file)
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -61,7 +61,7 @@ int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name)
             offset > 0;
             offset = fdt_next_subnode(fdt, offset)) {
                if (pre_reloc_only &&
-                   !dm_ofnode_pre_reloc(offset_to_ofnode(offset)))
+                   !ofnode_pre_reloc(offset_to_ofnode(offset)))
                        continue;
                /*
                 * If this node has "compatible" property, this is not

diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 68204c303fbd37566e87b00f55aa118fbc155cbb..c7db14ed56e36ca095d210657ec8e12f71622802 100644 (file)
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -175,7 +175,7 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp,
                        continue;
 
                if (pre_reloc_only) {
-                       if (!dm_ofnode_pre_reloc(node) &&
+                       if (!ofnode_pre_reloc(node) &&
                            !(entry->flags & DM_FLAG_PRE_RELOC)) {
                                log_debug("Skipping device pre-relocation\n");
                                return 0;

diff --git a/drivers/core/util.c b/drivers/core/util.c
index 69f83755f05fa6455e2e122e6a806941aa0aa46c..25b0d76f430d7249a4efe15422644e560337d481 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -33,34 +33,6 @@ int list_count_items(struct list_head *head)
        return count;
 }
 
-#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
-bool dm_ofnode_pre_reloc(ofnode node)
-{
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
-       /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
-        * had property dm-pre-reloc or u-boot,dm-spl/tpl.
-        * They are removed in final dtb (fdtgrep 2nd pass)
-        */
-       return true;
-#else
-       if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
-               return true;
-       if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
-               return true;
-
-       /*
-        * In regular builds individual spl and tpl handling both
-        * count as handled pre-relocation for later second init.
-        */
-       if (ofnode_read_bool(node, "u-boot,dm-spl") ||
-           ofnode_read_bool(node, "u-boot,dm-tpl"))
-               return true;
-
-       return false;
-#endif
-}
-#endif
-
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 int pci_get_devfn(struct udevice *dev)
 {

diff --git a/include/dm/util.h b/include/dm/util.h
index 0ccb3fbadf4bdd17a662fb485adcee188b11322e..23f8deb14e6e13b95195762ba21c14102cb1e701 100644 (file)
--- a/include/dm/util.h
+++ b/include/dm/util.h
@@ -42,31 +42,4 @@ static inline void dm_dump_devres(void)
 /* Dump out a list of drivers */
 void dm_dump_drivers(void);
 
-/**
- * Check if an of node should be or was bound before relocation.
- *
- * Devicetree nodes can be marked as needed to be bound
- * in the loader stages via special devicetree properties.
- *
- * Before relocation this function can be used to check if nodes
- * are required in either SPL or TPL stages.
- *
- * After relocation and jumping into the real U-Boot binary
- * it is possible to determine if a node was bound in one of
- * SPL/TPL stages.
- *
- * There are 4 settings currently in use
- * - u-boot,dm-pre-proper: U-Boot proper pre-relocation only
- * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL
- *   Existing platforms only use it to indicate nodes needed in
- *   SPL. Should probably be replaced by u-boot,dm-spl for
- *   existing platforms.
- * - u-boot,dm-spl: SPL and U-Boot pre-relocation
- * - u-boot,dm-tpl: TPL and U-Boot pre-relocation
- * @node: of node
- *
- * Returns true if node is needed in SPL/TL, false otherwise.
- */
-bool dm_ofnode_pre_reloc(ofnode node);
-
 #endif