diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-17 13:21:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-17 13:21:09 +0100 |
| commit | a26aeb177d8c1c4df3e32f0a21e8dd5b45ab1fc1 (patch) | |
| tree | 5ed97aefa2b24b89e033dd403d6a0865fb7ae202 /drivers/regulator | |
| parent | regulator: constify of_device_id array (diff) | |
| parent | regulator: palmas: Correct TPS659038 register definition for REGEN2 (diff) | |
| download | linux-a26aeb177d8c1c4df3e32f0a21e8dd5b45ab1fc1.tar.xz linux-a26aeb177d8c1c4df3e32f0a21e8dd5b45ab1fc1.zip | |
Merge branch 'fix/palmas' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-palmas
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 eecce1e66320..9518a76ad29e 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; |