regulator: Make bulk API support optional supplies

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>

3 files changed, 12 insertions, 4 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 73b7683355cd..4cf1390784e5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -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",
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index 6ec1d400adae..6ad8ab4c578d 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -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",
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 9e0e76992be0..48603506f8de 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -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 */