UPSTREAM: regulator: core: Add support for active-discharge configuration
authorLaxman Dewangan <ldewangan@nvidia.com>
Wed, 2 Mar 2016 10:54:46 +0000 (16:24 +0530)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 6 Mar 2017 10:28:40 +0000 (18:28 +0800)
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 <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 909f7ee0b5f30f735e16864a7ed18d2e6123e6d9)

Change-Id: I9b989b8b88e9d8e765a6cefb1a189c86e7c87dbe
Signed-off-by: David Wu <david.wu@rock-chips.com>
drivers/regulator/core.c

index 7fe492e9b29e42becb2249b2ba58b08159a3225a..a03d79907074ca74b75a3aee73c69c74970dd3a2 100644 (file)
@@ -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;
 }