regulator: max77802: set opmode to normal if off is read from hw

The max77802 driver reads the default operating mode (opmode)
set for regulators when enabled from the hardware registers.

But if a regulator is disabled and the system warm restarted,
the hardware reports OFF as the opmode so the regulator is
not enabled. Default to operating mode NORMAL if OFF is read
from the hardware register.

Reported-by: Yuvaraj Cd <yuvaraj.lkml@gmail.com>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Yuvaraj Kumar CD <yuvaraj.cd@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802.c
index ad1caa902ef05f54ff24fbd4e302079d380ff40b..967e10934d3ee6d9ef5b9a3aa1d3ac647b332f06 100644 (file)
--- a/drivers/regulator/max77802.c
+++ b/drivers/regulator/max77802.c
@@ -540,7 +540,17 @@ static int max77802_pmic_probe(struct platform_device *pdev)
                config.of_node = pdata->regulators[i].of_node;
 
                ret = regmap_read(iodev->regmap, regulators[i].enable_reg, &val);
-               max77802->opmode[id] = val >> shift & MAX77802_OPMODE_MASK;
+               val = val >> shift & MAX77802_OPMODE_MASK;
+
+               /*
+                * If the regulator is disabled and the system warm rebooted,
+                * the hardware reports OFF as the regulator operating mode.
+                * Default to operating mode NORMAL in that case.
+                */
+               if (val == MAX77802_OPMODE_OFF)
+                       max77802->opmode[id] = MAX77802_OPMODE_NORMAL;
+               else
+                       max77802->opmode[id] = val;
 
                rdev = devm_regulator_register(&pdev->dev,
                                               &regulators[i], &config);