]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: palmas: Fix "enable_reg" to point to the correct reg for SMPS10
authorKishon Vijay Abraham I <kishon@ti.com>
Thu, 30 May 2013 10:25:09 +0000 (15:55 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Jun 2013 19:53:22 +0000 (12:53 -0700)
commit f232168df0c7e7414b70ac5d8fed83086d441c0b upstream.

regulator_enable_regmap() uses enable_reg to enable the regulator.
But enable_reg for smps10 points to SMPS10_STATUS which is a
read-only register. Fixed the same by having enable_reg
set to SMPS10_CTRL.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/regulator/palmas-regulator.c

index 39cf14606784bd3571c6aab2d361807d0bdf7c99..149fad495ca829d856791507e0b0d60999a263a2 100644 (file)
@@ -677,7 +677,7 @@ static int palmas_probe(struct platform_device *pdev)
                        pmic->desc[id].vsel_mask = SMPS10_VSEL;
                        pmic->desc[id].enable_reg =
                                        PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
-                                                       PALMAS_SMPS10_STATUS);
+                                                       PALMAS_SMPS10_CTRL);
                        pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
                        pmic->desc[id].min_uV = 3750000;
                        pmic->desc[id].uV_step = 1250000;