summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnson Huang <Anson.Huang@nxp.com>2018-05-17 15:27:22 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-09 12:20:28 +0200
commitac34de0dff6a408595bf34c1b1f8be37681ce682 (patch)
tree7cebbc6bef4c2201e9940cef1125ffbd3f692c09
parentee9460d400aca613555368532dd304d49fd7764b (diff)
downloadlinux-stable-ac34de0dff6a408595bf34c1b1f8be37681ce682.tar.gz
linux-stable-ac34de0dff6a408595bf34c1b1f8be37681ce682.tar.bz2
linux-stable-ac34de0dff6a408595bf34c1b1f8be37681ce682.zip
regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
[ Upstream commit 0b01fd3d40fe6402e5fa3b491ef23109feb1aaa5 ] If is_enabled() is not defined, regulator core will assume this regulator is already enabled, then it can NOT be really enabled after disabled. Based on Li Jun's patch from the NXP kernel tree. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/regulator/pfuze100-regulator.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index c879dff597ee..eceb75105c08 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -142,6 +142,7 @@ static struct regulator_ops pfuze100_sw_regulator_ops = {
static struct regulator_ops pfuze100_swb_regulator_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
.list_voltage = regulator_list_voltage_table,
.map_voltage = regulator_map_voltage_ascend,
.set_voltage_sel = regulator_set_voltage_sel_regmap,