summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-25 00:51:42 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-25 00:51:42 +0100
commit7c9049dd47688d6ac336fa8a1f15ab7d8648fbd1 (patch)
tree4d36795591aca90b0d9cb2180715ac587844ad1c /drivers
parentMerge tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentMerge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas'... (diff)
downloadlinux-7c9049dd47688d6ac336fa8a1f15ab7d8648fbd1.tar.xz
linux-7c9049dd47688d6ac336fa8a1f15ab7d8648fbd1.zip
Merge tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "Two fixes here, one typo fix in the documentation and one fix for a system hang with one of the Palmas chips caused by the use of an incorrect offset being provided for one of the registers" * tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: Fix documentation for regmap in the config regulator: palmas: Correct TPS659038 register definition for REGEN2
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/palmas-regulator.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 9205f433573c..18198316b6cf 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -1572,6 +1572,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)
if (!pmic)
return -ENOMEM;
+ if (of_device_is_compatible(node, "ti,tps659038-pmic"))
+ palmas_generic_regs_info[PALMAS_REG_REGEN2].ctrl_addr =
+ TPS659038_REGEN2_CTRL;
+
pmic->dev = &pdev->dev;
pmic->palmas = palmas;
palmas->pmic = pmic;