diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-06-23 16:53:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-24 06:58:36 -0400 |
| commit | 5b01bd11b78b71ea1f5fc93e6e45ce6d71f5de1b (patch) | |
| tree | 38e50ca2187cc8268c9ac463f59134052ce500ae | |
| parent | 318dbb02b50c8d4535ceb52f382e74ff7953aa42 (diff) | |
regulator: palmas: fix typo in enable_reg calculation
When setting up .enable_reg for an SMPS regulator, presumably we should
call PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, ...) rather than using
LDO_BASE. This change makes the LCD panel and HDMI work again on the
NVIDIA Dalmore board anyway.
Fixes: 318dbb02b50c ("regulator: palmas: Fix SMPS enable/disable/is_enabled")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index f5f522c499ba..327788892cc9 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
| @@ -968,7 +968,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) | |||
| 968 | PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; | 968 | PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; |
| 969 | 969 | ||
| 970 | pmic->desc[id].enable_reg = | 970 | pmic->desc[id].enable_reg = |
| 971 | PALMAS_BASE_TO_REG(PALMAS_LDO_BASE, | 971 | PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, |
| 972 | palmas_regs_info[id].ctrl_addr); | 972 | palmas_regs_info[id].ctrl_addr); |
| 973 | pmic->desc[id].enable_mask = | 973 | pmic->desc[id].enable_mask = |
| 974 | PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; | 974 | PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; |