The patch regulator: max77620: Add support to configure active-discharge
has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 51817f468fb1a903d82ff2edd0e611d04910e675 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan <[email protected]> Date: Wed, 2 Mar 2016 16:24:48 +0530 Subject: [PATCH] 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 <[email protected]> Signed-off-by: Mark Brown <[email protected]> --- drivers/regulator/max77620-regulator.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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, \ }, \ } -- 2.7.0
