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 | |
| 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
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 4 | ||||
| -rw-r--r-- | include/linux/mfd/palmas.h | 3 |
2 files changed, 7 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; diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index fb0390a1a498..ee7b1ce7a6f8 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -2999,6 +2999,9 @@ enum usb_irq_events { #define PALMAS_GPADC_TRIM15 0x0E #define PALMAS_GPADC_TRIM16 0x0F +/* TPS659038 regen2_ctrl offset iss different from palmas */ +#define TPS659038_REGEN2_CTRL 0x12 + /* TPS65917 Interrupt registers */ /* Registers for function INTERRUPT */ |