summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2016-03-02 13:54:48 +0300
committerMark Brown <broonie@kernel.org>2016-03-02 17:31:45 +0300
commit51817f468fb1a903d82ff2edd0e611d04910e675 (patch)
treec851de723e3b79442f8934259a3c66a22f518ab4 /drivers/regulator
parent909f7ee0b5f30f735e16864a7ed18d2e6123e6d9 (diff)
downloadlinux-51817f468fb1a903d82ff2edd0e611d04910e675.tar.xz
regulator: max77620: Add support to configure active-discharge
Add regulator ops callback for configuration of active-discharge and provide necessarily information via regulator descriptor. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max77620-regulator.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 259e7e159c2f..73a3356a5c19 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -578,6 +578,7 @@ static struct regulator_ops max77620_regulator_ops = {
.get_mode = max77620_regulator_get_mode,
.set_ramp_delay = max77620_regulator_set_ramp_delay,
.set_voltage_time_sel = regulator_set_voltage_time_sel,
+ .set_active_discharge = regulator_set_active_discharge_regmap,
};
#define MAX77620_SD_CNF2_ROVS_EN_NONE 0
@@ -606,6 +607,10 @@ static struct regulator_ops max77620_regulator_ops = {
.enable_time = 500, \
.vsel_mask = MAX77620_##_volt_mask##_VOLT_MASK, \
.vsel_reg = MAX77620_REG_##_id, \
+ .active_discharge_off = 0, \
+ .active_discharge_on = MAX77620_SD_CFG1_ADE_ENABLE, \
+ .active_discharge_mask = MAX77620_SD_CFG1_ADE_MASK, \
+ .active_discharge_reg = MAX77620_REG_##_id##_CFG, \
.type = REGULATOR_VOLTAGE, \
}, \
}
@@ -633,6 +638,10 @@ static struct regulator_ops max77620_regulator_ops = {
.enable_time = 500, \
.vsel_mask = MAX77620_LDO_VOLT_MASK, \
.vsel_reg = MAX77620_REG_##_id##_CFG, \
+ .active_discharge_off = 0, \
+ .active_discharge_on = MAX77620_LDO_CFG2_ADE_ENABLE, \
+ .active_discharge_mask = MAX77620_LDO_CFG2_ADE_MASK, \
+ .active_discharge_reg = MAX77620_REG_##_id##_CFG2, \
.type = REGULATOR_VOLTAGE, \
}, \
}