regulator: Make bulk API support optional supplies
authorBjorn Andersson <bjorn.andersson@sonymobile.com>
Tue, 10 Nov 2015 06:20:37 +0000 (22:20 -0800)
committerMark Brown <broonie@kernel.org>
Tue, 17 Nov 2015 18:54:07 +0000 (18:54 +0000)
Make it possible to use the bulk API with optional supplies, by allowing
the consumer to marking supplies as optional in the regulator_bulk_data.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/core.c
drivers/regulator/devres.c
include/linux/regulator/consumer.h

index 73b7683355cd015791114249defc26fdf2b644cf..4cf1390784e54a2ca04d1177fa50bb9e2fff3c37 100644 (file)
@@ -3451,8 +3451,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
                consumers[i].consumer = NULL;
 
        for (i = 0; i < num_consumers; i++) {
-               consumers[i].consumer = regulator_get(dev,
-                                                     consumers[i].supply);
+               consumers[i].consumer = _regulator_get(dev,
+                                                      consumers[i].supply,
+                                                      false,
+                                                      !consumers[i].optional);
                if (IS_ERR(consumers[i].consumer)) {
                        ret = PTR_ERR(consumers[i].consumer);
                        dev_err(dev, "Failed to get supply '%s': %d\n",
index 6ec1d400adae7e444102266385171c5d787110a3..6ad8ab4c578d679ae753ec240b4ae518f6eb35ca 100644 (file)
@@ -164,8 +164,11 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers,
                consumers[i].consumer = NULL;
 
        for (i = 0; i < num_consumers; i++) {
-               consumers[i].consumer = devm_regulator_get(dev,
-                                                          consumers[i].supply);
+               consumers[i].consumer = _devm_regulator_get(dev,
+                                                           consumers[i].supply,
+                                                           consumers[i].optional ?
+                                                               OPTIONAL_GET :
+                                                               NORMAL_GET);
                if (IS_ERR(consumers[i].consumer)) {
                        ret = PTR_ERR(consumers[i].consumer);
                        dev_err(dev, "Failed to get supply '%s': %d\n",
index 9e0e76992be082f68ba6651207fc8b7a4f9bc976..48603506f8de34f417d2f16ec7759c2936ecaddc 100644 (file)
@@ -140,6 +140,8 @@ struct regulator;
  *
  * @supply:   The name of the supply.  Initialised by the user before
  *            using the bulk regulator APIs.
+ * @optional: The supply should be considered optional. Initialised by the user
+ *            before using the bulk regulator APIs.
  * @consumer: The regulator consumer for the supply.  This will be managed
  *            by the bulk API.
  *
@@ -149,6 +151,7 @@ struct regulator;
  */
 struct regulator_bulk_data {
        const char *supply;
+       bool optional;
        struct regulator *consumer;
 
        /* private: Internal use */