From: Kishon Vijay Abraham I Date: Thu, 30 May 2013 10:25:09 +0000 (+0530) Subject: regulator: palmas: Fix "enable_reg" to point to the correct reg for SMPS10 X-Git-Tag: v3.9.5~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=032e6d6cfe7dfa4a36b228755e8c5e4d9fd81107;p=thirdparty%2Fkernel%2Fstable.git regulator: palmas: Fix "enable_reg" to point to the correct reg for SMPS10 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 Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 39cf14606784b..149fad495ca82 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -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;