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-06 16:24:35 +0200
commit9f543747d4b460b418fa29cb87d26258af96e6ae (patch)
tree23913fd4b9cf9e9ac76d0deb186b9ecbfbca5b9b
parentc1da6e315e1b00867c0a0c900b3549c5f940aea9 (diff)
downloadlinux-stable-9f543747d4b460b418fa29cb87d26258af96e6ae.tar.gz
linux-stable-9f543747d4b460b418fa29cb87d26258af96e6ae.tar.bz2
linux-stable-9f543747d4b460b418fa29cb87d26258af96e6ae.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 2a44e5dd9c2a..c68556bf6f39 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -152,6 +152,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,