dm: core: add functions to get/remap I/O addresses by name

[u-boot.git] / drivers / power / regulator / regulator-uclass.c

diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 12e141b4adedbda7b2d44b1f3ddfd913eaa9ffb1..4da8e43259fc29bb43fa9073b374ed04cd6ba248 100644 (file)
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -1,19 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014-2015 Samsung Electronics
  * Przemyslaw Marczak <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
+
 #include <common.h>
-#include <fdtdec.h>
 #include <errno.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 int regulator_mode(struct udevice *dev, struct dm_regulator_mode **modep)
 {
        struct dm_regulator_uclass_platdata *uc_pdata;
@@ -39,6 +36,27 @@ int regulator_get_value(struct udevice *dev)
 }
 
 int regulator_set_value(struct udevice *dev, int uV)
+{
+       const struct dm_regulator_ops *ops = dev_get_driver_ops(dev);
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       if (uc_pdata->min_uV != -ENODATA && uV < uc_pdata->min_uV)
+               return -EINVAL;
+       if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV)
+               return -EINVAL;
+
+       if (!ops || !ops->set_value)
+               return -ENOSYS;
+
+       return ops->set_value(dev, uV);
+}
+
+/*
+ * To be called with at most caution as there is no check
+ * before setting the actual voltage value.
+ */
+int regulator_set_value_force(struct udevice *dev, int uV)
 {
        const struct dm_regulator_ops *ops = dev_get_driver_ops(dev);
 
@@ -61,6 +79,13 @@ int regulator_get_current(struct udevice *dev)
 int regulator_set_current(struct udevice *dev, int uA)
 {
        const struct dm_regulator_ops *ops = dev_get_driver_ops(dev);
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       if (uc_pdata->min_uA != -ENODATA && uA < uc_pdata->min_uA)
+               return -EINVAL;
+       if (uc_pdata->max_uA != -ENODATA && uA > uc_pdata->max_uA)
+               return -EINVAL;
 
        if (!ops || !ops->set_current)
                return -ENOSYS;
@@ -68,7 +93,7 @@ int regulator_set_current(struct udevice *dev, int uA)
        return ops->set_current(dev, uA);
 }
 
-bool regulator_get_enable(struct udevice *dev)
+int regulator_get_enable(struct udevice *dev)
 {
        const struct dm_regulator_ops *ops = dev_get_driver_ops(dev);
 
@@ -118,8 +143,10 @@ int regulator_get_by_platname(const char *plat_name, struct udevice **devp)
 
        for (ret = uclass_find_first_device(UCLASS_REGULATOR, &dev); dev;
             ret = uclass_find_next_device(&dev)) {
-               if (ret)
+               if (ret) {
+                       debug("regulator %s, ret=%d\n", dev->name, ret);
                        continue;
+               }
 
                uc_pdata = dev_get_uclass_platdata(dev);
                if (!uc_pdata || strcmp(plat_name, uc_pdata->name))
@@ -128,7 +155,7 @@ int regulator_get_by_platname(const char *plat_name, struct udevice **devp)
                return uclass_get_device_tail(dev, 0, devp);
        }
 
-       debug("%s: can't find: %s\n", __func__, plat_name);
+       debug("%s: can't find: %s, ret=%d\n", __func__, plat_name, ret);
 
        return -ENODEV;
 }
@@ -138,6 +165,13 @@ int regulator_get_by_devname(const char *devname, struct udevice **devp)
        return uclass_get_device_by_name(UCLASS_REGULATOR, devname, devp);
 }
 
+int device_get_supply_regulator(struct udevice *dev, const char *supply_name,
+                               struct udevice **devp)
+{
+       return uclass_get_device_by_phandle(UCLASS_REGULATOR, dev,
+                                           supply_name, devp);
+}
+
 int regulator_autoset(struct udevice *dev)
 {
        struct dm_regulator_uclass_platdata *uc_pdata;
@@ -171,7 +205,7 @@ static void regulator_show(struct udevice *dev, int ret)
                printf("; set %d uA", uc_pdata->min_uA);
        printf("; enabling");
        if (ret)
-               printf(" (ret: %d)\n", ret);
+               printf(" (ret: %d)", ret);
        printf("\n");
 }
 
@@ -184,7 +218,7 @@ int regulator_autoset_by_name(const char *platname, struct udevice **devp)
        if (devp)
                *devp = dev;
        if (ret) {
-               debug("Can get the regulator: %s!", platname);
+               debug("Can get the regulator: %s (err=%d)\n", platname, ret);
                return ret;
        }
 
@@ -243,26 +277,24 @@ static bool regulator_name_is_unique(struct udevice *check_dev,
 static int regulator_post_bind(struct udevice *dev)
 {
        struct dm_regulator_uclass_platdata *uc_pdata;
-       int offset = dev->of_offset;
-       const void *blob = gd->fdt_blob;
        const char *property = "regulator-name";
 
        uc_pdata = dev_get_uclass_platdata(dev);
-       if (!uc_pdata)
-               return -ENXIO;
 
        /* Regulator's mandatory constraint */
-       uc_pdata->name = fdt_getprop(blob, offset, property, NULL);
+       uc_pdata->name = dev_read_string(dev, property);
        if (!uc_pdata->name) {
-               debug("%s: dev: %s has no property 'regulator-name'\n",
-                     __func__, dev->name);
-               return -EINVAL;
+               debug("%s: dev '%s' has no property '%s'\n",
+                     __func__, dev->name, property);
+               uc_pdata->name = dev_read_name(dev);
+               if (!uc_pdata->name)
+                       return -EINVAL;
        }
 
        if (regulator_name_is_unique(dev, uc_pdata->name))
                return 0;
 
-       debug("\"%s\" of dev: \"%s\", has nonunique value: \"%s\"",
+       debug("'%s' of dev: '%s', has nonunique value: '%s\n",
              property, dev->name, uc_pdata->name);
 
        return -EINVAL;
@@ -271,25 +303,22 @@ static int regulator_post_bind(struct udevice *dev)
 static int regulator_pre_probe(struct udevice *dev)
 {
        struct dm_regulator_uclass_platdata *uc_pdata;
-       int offset = dev->of_offset;
 
        uc_pdata = dev_get_uclass_platdata(dev);
        if (!uc_pdata)
                return -ENXIO;
 
        /* Regulator's optional constraints */
-       uc_pdata->min_uV = fdtdec_get_int(gd->fdt_blob, offset,
-                                         "regulator-min-microvolt", -ENODATA);
-       uc_pdata->max_uV = fdtdec_get_int(gd->fdt_blob, offset,
-                                         "regulator-max-microvolt", -ENODATA);
-       uc_pdata->min_uA = fdtdec_get_int(gd->fdt_blob, offset,
-                                         "regulator-min-microamp", -ENODATA);
-       uc_pdata->max_uA = fdtdec_get_int(gd->fdt_blob, offset,
-                                         "regulator-max-microamp", -ENODATA);
-       uc_pdata->always_on = fdtdec_get_bool(gd->fdt_blob, offset,
-                                             "regulator-always-on");
-       uc_pdata->boot_on = fdtdec_get_bool(gd->fdt_blob, offset,
-                                           "regulator-boot-on");
+       uc_pdata->min_uV = dev_read_u32_default(dev, "regulator-min-microvolt",
+                                               -ENODATA);
+       uc_pdata->max_uV = dev_read_u32_default(dev, "regulator-max-microvolt",
+                                               -ENODATA);
+       uc_pdata->min_uA = dev_read_u32_default(dev, "regulator-min-microamp",
+                                               -ENODATA);
+       uc_pdata->max_uA = dev_read_u32_default(dev, "regulator-max-microamp",
+                                               -ENODATA);
+       uc_pdata->always_on = dev_read_bool(dev, "regulator-always-on");
+       uc_pdata->boot_on = dev_read_bool(dev, "regulator-boot-on");
 
        /* Those values are optional (-ENODATA if unset) */
        if ((uc_pdata->min_uV != -ENODATA) &&
@@ -316,13 +345,17 @@ int regulators_enable_boot_on(bool verbose)
        if (ret)
                return ret;
        for (uclass_first_device(UCLASS_REGULATOR, &dev);
-            dev && !ret;
+            dev;
             uclass_next_device(&dev)) {
                ret = regulator_autoset(dev);
-               if (ret == -EMEDIUMTYPE)
+               if (ret == -EMEDIUMTYPE) {
+                       ret = 0;
                        continue;
+               }
                if (verbose)
                        regulator_show(dev, ret);
+               if (ret == -ENOSYS)
+                       ret = 0;
        }
 
        return ret;