diff options
author | Keerthy <j-keerthy@ti.com> | 2015-03-17 15:56:04 +0530 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-16 20:13:16 -0400 |
commit | 3d8fc13835497f122ba638f96d72c71063586f4f (patch) | |
tree | f4e6b092ea4add7b1ae961286fceb2afff8f6a02 /drivers/regulator | |
parent | bac01bf2da68672590990f13e8d1e9c0b1c6ed63 (diff) |
regulator: palmas: Correct TPS659038 register definition for REGEN2
[ Upstream commit e03826d5045e81a66a4fad7be9a8ecdaeb7911cf ]
The register offset for REGEN2_CTRL in different for TPS659038 chip as when
compared with other Palmas family PMICs. In the case of TPS659038 the wrong
offset pointed to PLLEN_CTRL and was causing a hang. Correcting the same.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/palmas-regulator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 1878e5b567ef..1a7f5fc11623 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; |