Commit b003e7f1 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Kalle Valo

ath10k: snoc: skip regulator operations

The regulator operations is trying to set a voltage to a fixed value, by
giving some wiggle room. But some board designs specifies regulator
voltages outside this limited range. One such example is the Lenovo Yoga
C630, with vdd-3.3-ch0 in particular specified at 3.1V.

But consumers with fixed voltage requirements should just rely on the
board configuration to provide the power at the required level, so this
code should be removed.
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7165ef89
...@@ -37,10 +37,10 @@ static char *const ce_name[] = { ...@@ -37,10 +37,10 @@ static char *const ce_name[] = {
}; };
static struct ath10k_vreg_info vreg_cfg[] = { static struct ath10k_vreg_info vreg_cfg[] = {
{NULL, "vdd-0.8-cx-mx", 800000, 850000, 0, 0, false}, {NULL, "vdd-0.8-cx-mx", 0, 0, false},
{NULL, "vdd-1.8-xo", 1800000, 1850000, 0, 0, false}, {NULL, "vdd-1.8-xo", 0, 0, false},
{NULL, "vdd-1.3-rfa", 1300000, 1350000, 0, 0, false}, {NULL, "vdd-1.3-rfa", 0, 0, false},
{NULL, "vdd-3.3-ch0", 3300000, 3350000, 0, 0, false}, {NULL, "vdd-3.3-ch0", 0, 0, false},
}; };
static struct ath10k_clk_info clk_cfg[] = { static struct ath10k_clk_info clk_cfg[] = {
...@@ -1377,9 +1377,8 @@ static int ath10k_get_vreg_info(struct ath10k *ar, struct device *dev, ...@@ -1377,9 +1377,8 @@ static int ath10k_get_vreg_info(struct ath10k *ar, struct device *dev,
done: done:
ath10k_dbg(ar, ATH10K_DBG_SNOC, ath10k_dbg(ar, ATH10K_DBG_SNOC,
"snog vreg %s min_v %u max_v %u load_ua %u settle_delay %lu\n", "snog vreg %s load_ua %u settle_delay %lu\n",
vreg_info->name, vreg_info->min_v, vreg_info->max_v, vreg_info->name, vreg_info->load_ua, vreg_info->settle_delay);
vreg_info->load_ua, vreg_info->settle_delay);
return 0; return 0;
} }
...@@ -1420,15 +1419,6 @@ static int __ath10k_snoc_vreg_on(struct ath10k *ar, ...@@ -1420,15 +1419,6 @@ static int __ath10k_snoc_vreg_on(struct ath10k *ar,
ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc regulator %s being enabled\n", ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc regulator %s being enabled\n",
vreg_info->name); vreg_info->name);
ret = regulator_set_voltage(vreg_info->reg, vreg_info->min_v,
vreg_info->max_v);
if (ret) {
ath10k_err(ar,
"failed to set regulator %s voltage-min: %d voltage-max: %d\n",
vreg_info->name, vreg_info->min_v, vreg_info->max_v);
return ret;
}
if (vreg_info->load_ua) { if (vreg_info->load_ua) {
ret = regulator_set_load(vreg_info->reg, vreg_info->load_ua); ret = regulator_set_load(vreg_info->reg, vreg_info->load_ua);
if (ret < 0) { if (ret < 0) {
...@@ -1453,7 +1443,6 @@ static int __ath10k_snoc_vreg_on(struct ath10k *ar, ...@@ -1453,7 +1443,6 @@ static int __ath10k_snoc_vreg_on(struct ath10k *ar,
err_enable: err_enable:
regulator_set_load(vreg_info->reg, 0); regulator_set_load(vreg_info->reg, 0);
err_set_load: err_set_load:
regulator_set_voltage(vreg_info->reg, 0, vreg_info->max_v);
return ret; return ret;
} }
...@@ -1475,10 +1464,6 @@ static int __ath10k_snoc_vreg_off(struct ath10k *ar, ...@@ -1475,10 +1464,6 @@ static int __ath10k_snoc_vreg_off(struct ath10k *ar,
if (ret < 0) if (ret < 0)
ath10k_err(ar, "failed to set load %s\n", vreg_info->name); ath10k_err(ar, "failed to set load %s\n", vreg_info->name);
ret = regulator_set_voltage(vreg_info->reg, 0, vreg_info->max_v);
if (ret)
ath10k_err(ar, "failed to set voltage %s\n", vreg_info->name);
return ret; return ret;
} }
......
...@@ -45,8 +45,6 @@ struct ath10k_snoc_ce_irq { ...@@ -45,8 +45,6 @@ struct ath10k_snoc_ce_irq {
struct ath10k_vreg_info { struct ath10k_vreg_info {
struct regulator *reg; struct regulator *reg;
const char *name; const char *name;
u32 min_v;
u32 max_v;
u32 load_ua; u32 load_ua;
unsigned long settle_delay; unsigned long settle_delay;
bool required; bool required;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment