Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

8 files changed, 121 insertions, 7 deletions

diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index ad1fde277661..e9dedb27deca 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -197,7 +197,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
         cpu_dev = &pdev->dev;
         cpu_dev->of_node = np;
 
-        cpu_reg = devm_regulator_get(cpu_dev, "cpu0");
+        cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0");
         if (IS_ERR(cpu_reg)) {
                 /*
                  * If cpu0 regulator supply node is present, but regulator is
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 2507f902fb7a..ab5dc3af4cfb 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -957,7 +957,7 @@ static int sht15_probe(struct platform_device *pdev)
          * If a regulator is available,
          * query what the supply voltage actually is!
          */
-        data->reg = devm_regulator_get(data->dev, "vcc");
+        data->reg = devm_regulator_get_optional(data->dev, "vcc");
         if (!IS_ERR(data->reg)) {
                 int voltage;
 
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 49a5bca418bd..5d088551196b 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1313,7 +1313,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
 
         supply = devm_regulator_get(dev, "vmmc");
         mmc->supply.vmmc = supply;
-        mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
+        mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");
 
         if (IS_ERR(supply))
                 return PTR_ERR(supply);
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index ee5f1676f14e..542407363dd2 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2231,7 +2231,7 @@ int dw_mci_probe(struct dw_mci *host)
                 }
         }
 
-        host->vmmc = devm_regulator_get(host->dev, "vmmc");
+        host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
         if (IS_ERR(host->vmmc)) {
                 ret = PTR_ERR(host->vmmc);
                 if (ret == -EPROBE_DEFER)
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 2c5a91bb8ec3..1956a3df7cf3 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -83,7 +83,7 @@ struct pxamci_host {
 static inline void pxamci_init_ocr(struct pxamci_host *host)
 {
 #ifdef CONFIG_REGULATOR
-        host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc");
+        host->vcc = regulator_get_optional(mmc_dev(host->mmc), "vmmc");
 
         if (IS_ERR(host->vcc))
                 host->vcc = NULL;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a78bd4f3aecc..dd2c083c434d 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2966,7 +2966,7 @@ int sdhci_add_host(struct sdhci_host *host)
                 mmc->caps |= MMC_CAP_NEEDS_POLL;
 
         /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */
-        host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc");
+        host->vqmmc = regulator_get_optional(mmc_dev(mmc), "vqmmc");
         if (IS_ERR_OR_NULL(host->vqmmc)) {
                 if (PTR_ERR(host->vqmmc) < 0) {
                         pr_info("%s: no vqmmc regulator found\n",
@@ -3042,7 +3042,7 @@ int sdhci_add_host(struct sdhci_host *host)
 
         ocr_avail = 0;
 
-        host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
+        host->vmmc = regulator_get_optional(mmc_dev(mmc), "vmmc");
         if (IS_ERR_OR_NULL(host->vmmc)) {
                 if (PTR_ERR(host->vmmc) < 0) {
                         pr_info("%s: no vmmc regulator found\n",
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a560da3a633e..9f4ccf2b3340 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1413,6 +1413,65 @@ struct regulator *regulator_get_exclusive(struct device *dev, const char *id)
 }
 EXPORT_SYMBOL_GPL(regulator_get_exclusive);
 
+/**
+ * regulator_get_optional - obtain optional access to a regulator.
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Returns a struct regulator corresponding to the regulator producer,
+ * or IS_ERR() condition containing errno.  Other consumers will be
+ * unable to obtain this reference is held and the use count for the
+ * regulator will be initialised to reflect the current state of the
+ * regulator.
+ *
+ * This is intended for use by consumers for devices which can have
+ * some supplies unconnected in normal use, such as some MMC devices.
+ * It can allow the regulator core to provide stub supplies for other
+ * supplies requested using normal regulator_get() calls without
+ * disrupting the operation of drivers that can handle absent
+ * supplies.
+ *
+ * Use of supply names configured via regulator_set_device_supply() is
+ * strongly encouraged.  It is recommended that the supply name used
+ * should match the name used for the supply and/or the relevant
+ * device pins in the datasheet.
+ */
+struct regulator *regulator_get_optional(struct device *dev, const char *id)
+{
+        return _regulator_get(dev, id, 0);
+}
+EXPORT_SYMBOL_GPL(regulator_get_optional);
+
+/**
+ * devm_regulator_get_optional - Resource managed regulator_get_optional()
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Managed regulator_get_optional(). Regulators returned from this
+ * function are automatically regulator_put() on driver detach. See
+ * regulator_get_optional() for more information.
+ */
+struct regulator *devm_regulator_get_optional(struct device *dev,
+                                              const char *id)
+{
+        struct regulator **ptr, *regulator;
+
+        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        regulator = regulator_get_optional(dev, id);
+        if (!IS_ERR(regulator)) {
+                *ptr = regulator;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return regulator;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_get_optional);
+
 /* Locks held by regulator_put() */
 static void _regulator_put(struct regulator *regulator)
 {
@@ -1439,6 +1498,36 @@ static void _regulator_put(struct regulator *regulator)
 }
 
 /**
+ * devm_regulator_get_exclusive - Resource managed regulator_get_exclusive()
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Managed regulator_get_exclusive(). Regulators returned from this function
+ * are automatically regulator_put() on driver detach. See regulator_get() for
+ * more information.
+ */
+struct regulator *devm_regulator_get_exclusive(struct device *dev,
+                                               const char *id)
+{
+        struct regulator **ptr, *regulator;
+
+        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        regulator = _regulator_get(dev, id, 1);
+        if (!IS_ERR(regulator)) {
+                *ptr = regulator;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return regulator;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_get_exclusive);
+
+/**
  * regulator_put - "free" the regulator source
  * @regulator: regulator source
  *
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 3610df8dd229..27be915caa96 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -137,6 +137,12 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
                                              const char *id);
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
                                                        const char *id);
+struct regulator *__must_check devm_regulator_get_exclusive(struct device *dev,
+                                                        const char *id);
+struct regulator *__must_check regulator_get_optional(struct device *dev,
+                                                      const char *id);
+struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
+                                                           const char *id);
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
@@ -217,6 +223,25 @@ devm_regulator_get(struct device *dev, const char *id)
         return NULL;
 }
 
+static inline struct regulator *__must_check
+regulator_get_exclusive(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+static inline struct regulator *__must_check
+regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+
+static inline struct regulator *__must_check
+devm_regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
 static inline void regulator_put(struct regulator *regulator)
 {
 }