Applied "regulator: mpq7920: Fix incorrect defines" to the regulator tree

[Mark Brown <broonie@kernel.org>]

The patch

   regulator: mpq7920: Fix incorrect defines

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 53ba2f1aa3860f7ea0bf81543aab4a66af3f01d0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 15 Jan 2020 08:29:53 +0800
Subject: [PATCH] regulator: mpq7920: Fix incorrect defines

Fix defines for MPQ7920_MASK_BUCK_ILIM and MPQ7920_DISCHARGE_ON
Remove unused MPQ7920_REG_REGULATOR_EN1.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20200115002953.14731-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/mpq7920.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/mpq7920.h b/drivers/regulator/mpq7920.h
index 1498a1e3f4f5..489924655a96 100644
--- a/drivers/regulator/mpq7920.h
+++ b/drivers/regulator/mpq7920.h
@@ -43,11 +43,10 @@
 #define MPQ7920_LDO5_REG_B		0x1e
 #define MPQ7920_LDO5_REG_C		0x1f
 #define MPQ7920_REG_MODE		0x20
-#define MPQ7920_REG_REGULATOR_EN1	0x22
 #define MPQ7920_REG_REGULATOR_EN	0x22
 
 #define MPQ7920_MASK_VREF		0x7f
-#define MPQ7920_MASK_BUCK_ILIM		0xd0
+#define MPQ7920_MASK_BUCK_ILIM		0xc0
 #define MPQ7920_MASK_LDO_ILIM		BIT(6)
 #define MPQ7920_MASK_DISCHARGE		BIT(5)
 #define MPQ7920_MASK_MODE		0xc0
@@ -57,7 +56,7 @@
 #define MPQ7920_MASK_DVS_SLEWRATE	0xc0
 #define MPQ7920_MASK_OVP		0x40
 #define MPQ7920_OVP_DISABLE		~(0x40)
-#define MPQ7920_DISCHARGE_ON		0x1
+#define MPQ7920_DISCHARGE_ON		BIT(5)
 
 #define MPQ7920_REGULATOR_EN_OFFSET	7
 
-- 
2.20.1