On 06/23/2014 03:53 PM, Stephen Warren wrote:
From: Stephen Warren <swarren@xxxxxxxxxx> 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. Cc: Alex Courbot <gnurou@xxxxxxxxx> Cc: Keerthy <j-keerthy@xxxxxx> Cc: Nishanth Menon <nm@xxxxxx> Cc: linux-omap@xxxxxxxxxxxxxxx Cc: linux-tegra@xxxxxxxxxxxxxxx Fixes: 318dbb02b50c ("regulator: palmas: Fix SMPS enable/disable/is_enabled") Fixes: dbabd624d4eec50b6 ("regulator: palmas: Reemove open coded functions with helper functions") Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> --- drivers/regulator/palmas-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 3c861d5f9245..93b4ad842901 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -970,7 +970,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;
Uggh... my bad.. Thanks for catching this. Acked-by: Nishanth Menon <nm@xxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html