Commit 5b01bd11 authored Jun 23, 2014 by Stephen Warren Committed by Mark Brown Jun 24, 2014

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: 318dbb02 ("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>

parent 318dbb02

drivers/regulator/palmas-regulator.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -968,7 +968,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
	PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;		PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;

	pmic->desc[id].enable_reg =		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);		palmas_regs_info[id].ctrl_addr);
	pmic->desc[id].enable_mask =		pmic->desc[id].enable_mask =
	PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;		PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;