ath10k: Use standard regulator bulk API in snoc

The regulator_get_optional() exists for cases where the driver needs do
behave differently depending on some regulator supply being present or
not, as we don't use this we can use the standard regulator_get() and
rely on its handling of unspecified regulators.

While the driver currently doesn't specify any loads the regulator
framework was updated last year to only account for load of enabled
regulators, so should the need appear it's better to apply load numbers
during initialization that dynamically.

With this the regulator wrappers have been reduced the become identical
to the standard bulk API provided by the regulator framework, so use
these instead of rolling our own.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 3d93ab09a29835824b093caaecc8a15b4ffff47a..1c9ff7e53e2fe2b6b6ac6c51acea6a6a019028fe 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -36,11 +36,11 @@ static char *const ce_name[] = {
        "WLAN_CE_11",
 };
 
-static struct ath10k_vreg_info vreg_cfg[] = {
-       {NULL, "vdd-0.8-cx-mx", 0, 0, false},
-       {NULL, "vdd-1.8-xo", 0, 0, false},
-       {NULL, "vdd-1.3-rfa", 0, 0, false},
-       {NULL, "vdd-3.3-ch0", 0, 0, false},
+static const char * const ath10k_regulators[] = {
+       "vdd-0.8-cx-mx",
+       "vdd-1.8-xo",
+       "vdd-1.3-rfa",
+       "vdd-3.3-ch0",
 };
 
 static struct ath10k_clk_info clk_cfg[] = {
@@ -1346,43 +1346,6 @@ static void ath10k_snoc_release_resource(struct ath10k *ar)
                ath10k_ce_free_pipe(ar, i);
 }
 
-static int ath10k_get_vreg_info(struct ath10k *ar, struct device *dev,
-                               struct ath10k_vreg_info *vreg_info)
-{
-       struct regulator *reg;
-       int ret = 0;
-
-       reg = devm_regulator_get_optional(dev, vreg_info->name);
-
-       if (IS_ERR(reg)) {
-               ret = PTR_ERR(reg);
-
-               if (ret  == -EPROBE_DEFER) {
-                       ath10k_err(ar, "EPROBE_DEFER for regulator: %s\n",
-                                  vreg_info->name);
-                       return ret;
-               }
-               if (vreg_info->required) {
-                       ath10k_err(ar, "Regulator %s doesn't exist: %d\n",
-                                  vreg_info->name, ret);
-                       return ret;
-               }
-               ath10k_dbg(ar, ATH10K_DBG_SNOC,
-                          "Optional regulator %s doesn't exist: %d\n",
-                          vreg_info->name, ret);
-               goto done;
-       }
-
-       vreg_info->reg = reg;
-
-done:
-       ath10k_dbg(ar, ATH10K_DBG_SNOC,
-                  "snog vreg %s load_ua %u settle_delay %lu\n",
-                  vreg_info->name, vreg_info->load_ua, vreg_info->settle_delay);
-
-       return 0;
-}
-
 static int ath10k_get_clk_info(struct ath10k *ar, struct device *dev,
                               struct ath10k_clk_info *clk_info)
 {
@@ -1411,114 +1374,6 @@ static int ath10k_get_clk_info(struct ath10k *ar, struct device *dev,
        return ret;
 }
 
-static int __ath10k_snoc_vreg_on(struct ath10k *ar,
-                                struct ath10k_vreg_info *vreg_info)
-{
-       int ret;
-
-       ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc regulator %s being enabled\n",
-                  vreg_info->name);
-
-       if (vreg_info->load_ua) {
-               ret = regulator_set_load(vreg_info->reg, vreg_info->load_ua);
-               if (ret < 0) {
-                       ath10k_err(ar, "failed to set regulator %s load: %d\n",
-                                  vreg_info->name, vreg_info->load_ua);
-                       goto err_set_load;
-               }
-       }
-
-       ret = regulator_enable(vreg_info->reg);
-       if (ret) {
-               ath10k_err(ar, "failed to enable regulator %s\n",
-                          vreg_info->name);
-               goto err_enable;
-       }
-
-       if (vreg_info->settle_delay)
-               udelay(vreg_info->settle_delay);
-
-       return 0;
-
-err_enable:
-       regulator_set_load(vreg_info->reg, 0);
-err_set_load:
-
-       return ret;
-}
-
-static int __ath10k_snoc_vreg_off(struct ath10k *ar,
-                                 struct ath10k_vreg_info *vreg_info)
-{
-       int ret;
-
-       ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc regulator %s being disabled\n",
-                  vreg_info->name);
-
-       ret = regulator_disable(vreg_info->reg);
-       if (ret)
-               ath10k_err(ar, "failed to disable regulator %s\n",
-                          vreg_info->name);
-
-       ret = regulator_set_load(vreg_info->reg, 0);
-       if (ret < 0)
-               ath10k_err(ar, "failed to set load %s\n", vreg_info->name);
-
-       return ret;
-}
-
-static int ath10k_snoc_vreg_on(struct ath10k *ar)
-{
-       struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
-       struct ath10k_vreg_info *vreg_info;
-       int ret = 0;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(vreg_cfg); i++) {
-               vreg_info = &ar_snoc->vreg[i];
-
-               if (!vreg_info->reg)
-                       continue;
-
-               ret = __ath10k_snoc_vreg_on(ar, vreg_info);
-               if (ret)
-                       goto err_reg_config;
-       }
-
-       return 0;
-
-err_reg_config:
-       for (i = i - 1; i >= 0; i--) {
-               vreg_info = &ar_snoc->vreg[i];
-
-               if (!vreg_info->reg)
-                       continue;
-
-               __ath10k_snoc_vreg_off(ar, vreg_info);
-       }
-
-       return ret;
-}
-
-static int ath10k_snoc_vreg_off(struct ath10k *ar)
-{
-       struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
-       struct ath10k_vreg_info *vreg_info;
-       int ret = 0;
-       int i;
-
-       for (i = ARRAY_SIZE(vreg_cfg) - 1; i >= 0; i--) {
-               vreg_info = &ar_snoc->vreg[i];
-
-               if (!vreg_info->reg)
-                       continue;
-
-               ret = __ath10k_snoc_vreg_off(ar, vreg_info);
-       }
-
-       return ret;
-}
-
 static int ath10k_snoc_clk_init(struct ath10k *ar)
 {
        struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
@@ -1591,11 +1446,12 @@ static int ath10k_snoc_clk_deinit(struct ath10k *ar)
 
 static int ath10k_hw_power_on(struct ath10k *ar)
 {
+       struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
        int ret;
 
        ath10k_dbg(ar, ATH10K_DBG_SNOC, "soc power on\n");
 
-       ret = ath10k_snoc_vreg_on(ar);
+       ret = regulator_bulk_enable(ar_snoc->num_vregs, ar_snoc->vregs);
        if (ret)
                return ret;
 
@@ -1606,21 +1462,19 @@ static int ath10k_hw_power_on(struct ath10k *ar)
        return ret;
 
 vreg_off:
-       ath10k_snoc_vreg_off(ar);
+       regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs);
        return ret;
 }
 
 static int ath10k_hw_power_off(struct ath10k *ar)
 {
-       int ret;
+       struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
 
        ath10k_dbg(ar, ATH10K_DBG_SNOC, "soc power off\n");
 
        ath10k_snoc_clk_deinit(ar);
 
-       ret = ath10k_snoc_vreg_off(ar);
-
-       return ret;
+       return regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs);
 }
 
 static const struct of_device_id ath10k_snoc_dt_match[] = {
@@ -1691,12 +1545,20 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
                goto err_release_resource;
        }
 
-       ar_snoc->vreg = vreg_cfg;
-       for (i = 0; i < ARRAY_SIZE(vreg_cfg); i++) {
-               ret = ath10k_get_vreg_info(ar, dev, &ar_snoc->vreg[i]);
-               if (ret)
-                       goto err_free_irq;
+       ar_snoc->num_vregs = ARRAY_SIZE(ath10k_regulators);
+       ar_snoc->vregs = devm_kcalloc(&pdev->dev, ar_snoc->num_vregs,
+                                     sizeof(*ar_snoc->vregs), GFP_KERNEL);
+       if (!ar_snoc->vregs) {
+               ret = -ENOMEM;
+               goto err_free_irq;
        }
+       for (i = 0; i < ar_snoc->num_vregs; i++)
+               ar_snoc->vregs[i].supply = ath10k_regulators[i];
+
+       ret = devm_regulator_bulk_get(&pdev->dev, ar_snoc->num_vregs,
+                                     ar_snoc->vregs);
+       if (ret < 0)
+               goto err_free_irq;
 
        ar_snoc->clk = clk_cfg;
        for (i = 0; i < ARRAY_SIZE(clk_cfg); i++) {

diff --git a/drivers/net/wireless/ath/ath10k/snoc.h b/drivers/net/wireless/ath/ath10k/snoc.h
index 1bf7bd4ef2a30ef3a6870a659fcb9cb031bf9670..3965ddf66d740631e364a2910ecb9ed966d007cf 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.h
+++ b/drivers/net/wireless/ath/ath10k/snoc.h
@@ -42,14 +42,6 @@ struct ath10k_snoc_ce_irq {
        u32 irq_line;
 };
 
-struct ath10k_vreg_info {
-       struct regulator *reg;
-       const char *name;
-       u32 load_ua;
-       unsigned long settle_delay;
-       bool required;
-};
-
 struct ath10k_clk_info {
        struct clk *handle;
        const char *name;
@@ -64,6 +56,8 @@ enum ath10k_snoc_flags {
        ATH10K_SNOC_FLAG_8BIT_HOST_CAP_QUIRK,
 };
 
+struct regulator_bulk_data;
+
 struct ath10k_snoc {
        struct platform_device *dev;
        struct ath10k *ar;
@@ -75,7 +69,8 @@ struct ath10k_snoc {
        struct ath10k_snoc_ce_irq ce_irqs[CE_COUNT_MAX];
        struct ath10k_ce ce;
        struct timer_list rx_post_retry;
-       struct ath10k_vreg_info *vreg;
+       struct regulator_bulk_data *vregs;
+       size_t num_vregs;
        struct ath10k_clk_info *clk;
        struct ath10k_qmi *qmi;
        unsigned long flags;