pci: Make Rockchip PCIe voltage regulators optional

[oweals/u-boot.git] / drivers / core / util.c

diff --git a/drivers/core/util.c b/drivers/core/util.c
index 60b939a92401fee3bf4a5a36a3992f1f4dfd8292..25b0d76f430d7249a4efe15422644e560337d481 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <dm/device.h>
 #include <dm/ofnode.h>
+#include <dm/read.h>
 #include <dm/util.h>
 #include <linux/libfdt.h>
 #include <vsprintf.h>
@@ -31,28 +33,20 @@ int list_count_items(struct list_head *head)
        return count;
 }
 
-bool dm_ofnode_pre_reloc(ofnode node)
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+int pci_get_devfn(struct udevice *dev)
 {
-#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
+       struct fdt_pci_addr addr;
+       int ret;
+
+       /* Extract the devfn from fdt_pci_addr */
+       ret = ofnode_read_pci_addr(dev_ofnode(dev), FDT_PCI_SPACE_CONFIG,
+                                  "reg", &addr);
+       if (ret) {
+               if (ret != -ENOENT)
+                       return -EINVAL;
+       }
+
+       return addr.phys_hi & 0xff00;
 }
+#endif