From 697883bd66ba1cc3245d34ad81d4443df9403ec5 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Wed, 2 Mar 2016 16:24:46 +0530 Subject: [PATCH] UPSTREAM: regulator: core: Add support for active-discharge configuration Add support to enable/disable active discharge of regulator via machine constraints. This configuration is done when setting machine constraint during regulator register and if regulator driver implemented the callback ops. Signed-off-by: Laxman Dewangan Signed-off-by: Mark Brown (cherry picked from commit 909f7ee0b5f30f735e16864a7ed18d2e6123e6d9) Change-Id: I9b989b8b88e9d8e765a6cefb1a189c86e7c87dbe Signed-off-by: David Wu --- drivers/regulator/core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 7fe492e9b29e..a03d79907074 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1148,6 +1148,17 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } + if (rdev->constraints->active_discharge && ops->set_active_discharge) { + bool ad_state = (rdev->constraints->active_discharge == + REGULATOR_ACTIVE_DISCHARGE_ENABLE) ? true : false; + + ret = ops->set_active_discharge(rdev, ad_state); + if (ret < 0) { + rdev_err(rdev, "failed to set active discharge\n"); + return ret; + } + } + print_constraints(rdev); return 0; } -- 2.34.1