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 aaaed4ec022586692a9ff9fe87ff885a82a11074..25b0d76f430d7249a4efe15422644e560337d481 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -1,12 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm/device.h>
+#include <dm/ofnode.h>
+#include <dm/read.h>
 #include <dm/util.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <vsprintf.h>
 
 #ifdef CONFIG_DM_WARN
@@ -31,26 +33,20 @@ int list_count_items(struct list_head *head)
        return count;
 }
 
-bool dm_fdt_pre_reloc(const void *blob, int offset)
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+int pci_get_devfn(struct udevice *dev)
 {
-       if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
-               return true;
-
-#ifdef CONFIG_TPL_BUILD
-       if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
-               return true;
-#elif defined(CONFIG_SPL_BUILD)
-       if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL))
-               return true;
-#else
-       /*
-        * In regular builds individual spl and tpl handling both
-        * count as handled pre-relocation for later second init.
-        */
-       if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL) ||
-           fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
-               return true;
-#endif
-
-       return false;
+       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