The patch regulator: mpq7920: Fix Woverflow warning on conversion has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 686f63616f4aede1356c1bc9fa4e9a92a123bcd6 Mon Sep 17 00:00:00 2001 From: Saravanan Sekar <sravanhome@xxxxxxxxx> Date: Fri, 10 Jan 2020 11:22:20 +0100 Subject: [PATCH] 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@xxxxxxxxx> Link: https://lore.kernel.org/r/20200110102220.7163-1-sravanhome@xxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> --- drivers/regulator/mpq7920.c | 2 +- drivers/regulator/mpq7920.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- 2.20.1
