[PATCH] regulator: palmas: fix typo in enable_reg calculation

[PATCH] regulator: palmas: fix typo in enable_reg calculation

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

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@gmail.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: linux-omap@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
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@nvidia.com>
---
 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;
-- 
1.8.1.5

Re: [PATCH] regulator: palmas: fix typo in enable_reg calculation

[Nishanth Menon]

On 06/23/2014 03:53 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> 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@gmail.com>
> Cc: Keerthy <j-keerthy@ti.com>
> Cc: Nishanth Menon <nm@ti.com>
> Cc: linux-omap@vger.kernel.org
> Cc: linux-tegra@vger.kernel.org
> 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@nvidia.com>
> ---
>   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@ti.com>

Re: [PATCH] regulator: palmas: fix typo in enable_reg calculation

[Alexandre Courbot]

On Tue, Jun 24, 2014 at 5:53 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> 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.

Tested-by: Alexandre Courbot <acourbot@nvidia.com>

Interestingly the first fix was enough for Tegra Note 7's panel -
probably due to the fact the panel was already on when the kernel took
over.

Re: [PATCH] regulator: palmas: fix typo in enable_reg calculation

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

On Mon, Jun 23, 2014 at 02:53:25PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> 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.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]