common: Drop net.h from common header

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

diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 3cf9dd9dbe43b65e89c1a0831653554673ae4818..15f0e42a85b45629fda20ecef539cd5e1f7ef5ec 100644 (file)
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <regmap.h>
 #include <dm/device-internal.h>
+#include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
@@ -37,6 +38,10 @@ static int syscon_pre_probe(struct udevice *dev)
 {
        struct syscon_uc_info *priv = dev_get_uclass_priv(dev);
 
+       /* Special case for PCI devices, which don't have a regmap */
+       if (device_get_uclass_id(dev->parent) == UCLASS_PCI)
+               return 0;
+
        /*
         * With OF_PLATDATA we really have no way of knowing the format of
         * the device-specific platform data. So we assume that it starts with
@@ -53,18 +58,64 @@ static int syscon_pre_probe(struct udevice *dev)
 #endif
 }
 
+static int syscon_probe_by_ofnode(ofnode node, struct udevice **devp)
+{
+       struct udevice *dev, *parent;
+       int ret;
+
+       /* found node with "syscon" compatible, not bounded to SYSCON UCLASS */
+       if (!ofnode_device_is_compatible(node, "syscon")) {
+               dev_dbg(dev, "invalid compatible for syscon device\n");
+               return -EINVAL;
+       }
+
+       /* bound to driver with same ofnode or to root if not found */
+       if (device_find_global_by_ofnode(node, &parent))
+               parent = dm_root();
+
+       /* force bound to syscon class */
+       ret = device_bind_driver_to_node(parent, "syscon",
+                                        ofnode_get_name(node),
+                                        node, &dev);
+       if (ret) {
+               dev_dbg(dev, "unable to bound syscon device\n");
+               return ret;
+       }
+       ret = device_probe(dev);
+       if (ret) {
+               dev_dbg(dev, "unable to probe syscon device\n");
+               return ret;
+       }
+
+       *devp = dev;
+       return 0;
+}
+
 struct regmap *syscon_regmap_lookup_by_phandle(struct udevice *dev,
                                               const char *name)
 {
        struct udevice *syscon;
        struct regmap *r;
+       u32 phandle;
+       ofnode node;
        int err;
 
        err = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,
                                           name, &syscon);
        if (err) {
-               dev_dbg(dev, "unable to find syscon device\n");
-               return ERR_PTR(err);
+               /* found node with "syscon" compatible, not bounded to SYSCON */
+               err = ofnode_read_u32(dev_ofnode(dev), name, &phandle);
+               if (err)
+                       return ERR_PTR(err);
+
+               node = ofnode_get_by_phandle(phandle);
+               if (!ofnode_valid(node)) {
+                       dev_dbg(dev, "unable to find syscon device\n");
+                       return ERR_PTR(-EINVAL);
+               }
+               err = syscon_probe_by_ofnode(node, &syscon);
+               if (err)
+                       return ERR_PTR(-ENODEV);
        }
 
        r = syscon_get_regmap(syscon);
@@ -78,22 +129,15 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct udevice *dev,
 
 int syscon_get_by_driver_data(ulong driver_data, struct udevice **devp)
 {
-       struct udevice *dev;
-       struct uclass *uc;
        int ret;
 
        *devp = NULL;
-       ret = uclass_get(UCLASS_SYSCON, &uc);
+
+       ret = uclass_first_device_drvdata(UCLASS_SYSCON, driver_data, devp);
        if (ret)
-               return ret;
-       uclass_foreach_dev(dev, uc) {
-               if (dev->driver_data == driver_data) {
-                       *devp = dev;
-                       return device_probe(dev);
-               }
-       }
+               return log_msg_ret("find", ret);
 
-       return -ENODEV;
+       return 0;
 }
 
 struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data)
@@ -148,29 +192,18 @@ U_BOOT_DRIVER(generic_syscon) = {
  */
 struct regmap *syscon_node_to_regmap(ofnode node)
 {
-       struct udevice *dev, *parent;
-       int ret;
-
-       if (!uclass_get_device_by_ofnode(UCLASS_SYSCON, node, &dev))
-               return syscon_get_regmap(dev);
-
-       if (!ofnode_device_is_compatible(node, "syscon"))
-               return ERR_PTR(-EINVAL);
-
-       /* bound to driver with same ofnode or to root if not found */
-       if (device_find_global_by_ofnode(node, &parent))
-               parent = dm_root();
+       struct udevice *dev;
+       struct regmap *r;
 
-       /* force bound to syscon class */
-       ret = device_bind_driver_to_node(parent, "syscon",
-                                        ofnode_get_name(node),
-                                        node, &dev);
-       if (ret)
-               return ERR_PTR(ret);
+       if (uclass_get_device_by_ofnode(UCLASS_SYSCON, node, &dev))
+               if (syscon_probe_by_ofnode(node, &dev))
+                       return ERR_PTR(-ENODEV);
 
-       ret = device_probe(dev);
-       if (ret)
-               return ERR_PTR(ret);
+       r = syscon_get_regmap(dev);
+       if (!r) {
+               dev_dbg(dev, "unable to find regmap\n");
+               return ERR_PTR(-ENODEV);
+       }
 
-       return syscon_get_regmap(dev);
+       return r;
 }