aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/regulator
diff options
context:
space:
mode:
authorSaravanan Sekar <sravanhome@gmail.com>2020-01-10 11:22:20 +0100
committerMark Brown <broonie@kernel.org>2020-01-10 13:35:40 +0000
commit686f63616f4aede1356c1bc9fa4e9a92a123bcd6 (patch)
tree9f96ec8452a6ee4f42d6dc0461657b3587e8f45e /drivers/regulator
parentregulator: mp8859: tidy up white space in probe (diff)
downloadwireguard-linux-686f63616f4aede1356c1bc9fa4e9a92a123bcd6.tar.xz
wireguard-linux-686f63616f4aede1356c1bc9fa4e9a92a123bcd6.zip
regulator: mpq7920: Fix Woverflow warning on conversion
Fix warning Woverflow on type conversion reported on x86. Fixes: 6501c1f54a17 (regulator: mpq7920: add mpq7920 regulator driver) Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> Link: https://lore.kernel.org/r/20200110102220.7163-1-sravanhome@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/mpq7920.c2
-rw-r--r--drivers/regulator/mpq7920.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/mpq7920.c b/drivers/regulator/mpq7920.c
index c603d60fb87b..ab1b847c57e5 100644
--- a/drivers/regulator/mpq7920.c
+++ b/drivers/regulator/mpq7920.c
@@ -221,7 +221,7 @@ static int mpq7920_parse_cb(struct device_node *np,
if (of_property_read_bool(np, "mps,buck-ovp-disable")) {
regmap_update_bits(config->regmap,
MPQ7920_BUCK1_REG_B + (rdesc->id * 4),
- BIT(6), ~BIT(6));
+ MPQ7920_MASK_OVP, MPQ7920_OVP_DISABLE);
}
ret = of_property_read_u8(np, "mps,buck-phase-delay", &val);
diff --git a/drivers/regulator/mpq7920.h b/drivers/regulator/mpq7920.h
index 6a93bfbc750c..1498a1e3f4f5 100644
--- a/drivers/regulator/mpq7920.h
+++ b/drivers/regulator/mpq7920.h
@@ -55,6 +55,8 @@
#define MPQ7920_MASK_SWITCH_FREQ 0x30
#define MPQ7920_MASK_BUCK_PHASE_DEALY 0x30
#define MPQ7920_MASK_DVS_SLEWRATE 0xc0
+#define MPQ7920_MASK_OVP 0x40
+#define MPQ7920_OVP_DISABLE ~(0x40)
#define MPQ7920_DISCHARGE_ON 0x1
#define MPQ7920_REGULATOR_EN_OFFSET 7