diff options
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2014-10-16 18:48:49 +0200
committerMark Brown <broonie@kernel.org>2014-10-20 12:23:50 +0100
commit0505be71490e49044314ca84dd443e0f3782ca5a (patch)
parent2e0eaa1aa0084ff1ee1af7cf388358b868143816 (diff)
regulator: max77802: Don't treat OFF as an operating mode
The only operating modes that are supported by the regulators in the max77802 PMIC are Output ON (normal) and Output On in Low Power Mode. OFF was wrongly counted as an operating mode while is only a regulator status. Make clear in the code that OFF is not an operating mode. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Mark Brown <broonie@kernel.org>
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802.c
index dae2c1acd879..3abf99dbf953 100644
--- a/drivers/regulator/max77802.c
+++ b/drivers/regulator/max77802.c
@@ -49,6 +49,7 @@
#define MAX77802_RAMP_RATE_MASK_4BIT 0xF0
#define MAX77802_RAMP_RATE_SHIFT_4BIT 4
+#define MAX77802_STATUS_OFF 0x0
#define MAX77802_OFF_PWRREQ 0x1
#define MAX77802_LP_PWRREQ 0x2
@@ -615,7 +616,7 @@ static int max77802_pmic_probe(struct platform_device *pdev)
* the hardware reports OFF as the regulator operating mode.
* Default to operating mode NORMAL in that case.
- if (val == MAX77802_OPMODE_OFF)
+ if (val == MAX77802_STATUS_OFF)
max77802->opmode[id] = MAX77802_OPMODE_NORMAL;
max77802->opmode[id] = val;

Privacy Policy