]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commitdiff
regulator: palmas: fix typo in enable_reg calculation
authorStephen Warren <swarren@nvidia.com>
Mon, 23 Jun 2014 20:53:25 +0000 (14:53 -0600)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 10:58:36 +0000 (11:58 +0100)
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>
drivers/regulator/palmas-regulator.c

index f5f522c499badb0e3cce99fddffe27eab6e431c6..327788892cc944dbb6b768685558d20ff6a60298 100644 (file)
@@ -968,7 +968,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                                        PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
 
                        pmic->desc[id].enable_reg =
-                                       PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
+                                       PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
                                                palmas_regs_info[id].ctrl_addr);
                        pmic->desc[id].enable_mask =
                                        PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;