[PATCH v2 0/5] mfd: palmas: add powerhold overriding during power off

[PATCH v2 0/5] mfd: palmas: add powerhold overriding during power off

[Keerthy]

The series lets one over powerhold for pmic.
The powerhold is used to keep the pmic power on even
after the DEV_CTRL On bit is set to off.

Tested on am572x-idk board, dra72-evm, dra7-evm for poweroff. 

Keerthy (5):
  Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override
    property definition
  mfd: palmas: Remove redundant check in palmas_power_off
  mfd: palmas: Reset the POWERHOLD mux during power off
  arm: dts: am57xx-beagle-x15-common: Add overide powerhold property
  arm: dts: am57xx-idk-common: Add overide powerhold property

 .../devicetree/bindings/pinctrl/pinctrl-palmas.txt        |  9 +++++++++
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi           |  1 +
 arch/arm/boot/dts/am57xx-idk-common.dtsi                  |  1 +
 drivers/mfd/palmas.c                                      | 15 +++++++++++++--
 4 files changed, 24 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH v2 1/5] Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition

[Keerthy]

GPIO7 is configured in POWERHOLD mode which has higher priority
over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
bit is turned off. This property enables driver to over ride the
POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
scenarios.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---
 Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
index caf297b..c28d4eb8 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
@@ -35,6 +35,15 @@ Optional properties:
 - ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.
 	Selection primary or secondary function associated to GPADC_START
 	and SYSEN2 pin/pad for DVFS2 interface
+- ti,palmas-override-powerhold: This is applicable for PMICs for which
+	GPIO7 is configured in POWERHOLD mode which has higher priority
+	over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
+	bit is turned off. This property enables driver to over ride the
+	POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
+	scenarios. So for GPIO7 if ti,palmas-override-powerhold is set
+	then the GPIO_7 field should never be muxed to anything else.
+	It should be set to POWERHOLD by default and only in case of
+	power off scenarios the driver will over ride the mux value.
 
 This binding uses the following generic properties as defined in
 pinctrl-bindings.txt:
-- 
1.9.1

[PATCH v2 2/5] mfd: palmas: Remove redundant check in palmas_power_off

[Keerthy]

palmas_dev and palmas_power_off are always assigned together.
So the check for palmas_dev inside palmas_power_off function
is redundant. Removing the same.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---
 drivers/mfd/palmas.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 8f8bacb..ee9e9ea 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -431,9 +431,6 @@ static void palmas_power_off(void)
 	unsigned int addr;
 	int ret, slave;
 
-	if (!palmas_dev)
-		return;
-
 	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
 	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
 
-- 
1.9.1

[PATCH v2 3/5] mfd: palmas: Reset the POWERHOLD mux during power off

[Keerthy]

POWERHOLD signal has higher priority  over the DEV_ON bit.
So power off will not happen if the POWERHOLD is held high.
Hence reset the MUX to GPIO_7 mode to release the POWERHOLD
and the DEV_ON bit to take effect to power off the PMIC.

PMIC Power off happens in dire situations like thermal shutdown
so irrespective of the POWERHOLD setting go ahead and turn off
the powerhold.  Currently poweroff is broken on boards that have
powerhold enabled. This fixes poweroff on those boards.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---

Changes in v2:

  * Changed pr_err to dev_err
  * removed redundant boolean variable override-powerhold

 drivers/mfd/palmas.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index ee9e9ea..da90124 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -430,6 +430,20 @@ static void palmas_power_off(void)
 {
 	unsigned int addr;
 	int ret, slave;
+	struct device_node *np = palmas_dev->dev->of_node;
+
+	if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
+		addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
+					  PALMAS_PRIMARY_SECONDARY_PAD2);
+		slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
+
+		ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
+				PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
+		if (ret)
+			dev_err(palmas_dev->dev,
+				"Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
+				ret);
+	}
 
 	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
 	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
-- 
1.9.1

[PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Keerthy]

The PMICs have POWERHOLD set by default which prevents PMIC shutdown
even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
So to enable pmic power off this property lets one over ride the default
value and enable pmic power off.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 6df7829..78bee26 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -204,6 +204,7 @@
 		interrupt-controller;
 
 		ti,system-power-controller;
+		ti,palmas-override-powerhold;
 
 		tps659038_pmic {
 			compatible = "ti,tps659038-pmic";
-- 
1.9.1

[PATCH v2 5/5] arm: dts: am57xx-idk-common: Add overide powerhold property

[Keerthy]

The PMICs have POWERHOLD set by default which prevents PMIC shutdown
even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
So to enable pmic power off this property lets one over ride the default
value and enable pmic power off.

Signed-off-by: Keerthy <j-keerthy@ti.com>
---
 arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 03cec62..6e7db63 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -57,6 +57,7 @@
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		ti,system-power-controller;
+		ti,palmas-override-powerhold;
 
 		tps659038_pmic {
 			compatible = "ti,tps659038-pmic";
-- 
1.9.1

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Tony Lindgren]

* Keerthy <j-keerthy@ti.com> [161109 21:10]:
> The PMICs have POWERHOLD set by default which prevents PMIC shutdown
> even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
> So to enable pmic power off this property lets one over ride the default
> value and enable pmic power off.

This should not cause merge conflicts so probably best to merge along
with the driver changes:

Acked-by: Tony Lindgren <tony@atomide.com>

If you guys want me to pick up this separately let me know.

Regards,

Tony

Re: [PATCH v2 5/5] arm: dts: am57xx-idk-common: Add overide powerhold property

[Tony Lindgren]

* Keerthy <j-keerthy@ti.com> [161109 21:10]:
> The PMICs have POWERHOLD set by default which prevents PMIC shutdown
> even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
> So to enable pmic power off this property lets one over ride the default
> value and enable pmic power off.

This too:

Acked-by: Tony Lindgren <tony@atomide.com>

Re: [PATCH v2 1/5] Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition

[Rob Herring]

On Thu, Nov 10, 2016 at 10:39:16AM +0530, Keerthy wrote:
> GPIO7 is configured in POWERHOLD mode which has higher priority
> over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
> bit is turned off. This property enables driver to over ride the
> POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
> scenarios.
> 
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
>  Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++
>  1 file changed, 9 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 2/5] mfd: palmas: Remove redundant check in palmas_power_off

[Lee Jones]

On Thu, 10 Nov 2016, Keerthy wrote:

> palmas_dev and palmas_power_off are always assigned together.
> So the check for palmas_dev inside palmas_power_off function
> is redundant. Removing the same.
> 
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
>  drivers/mfd/palmas.c | 3 ---
>  1 file changed, 3 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
> index 8f8bacb..ee9e9ea 100644
> --- a/drivers/mfd/palmas.c
> +++ b/drivers/mfd/palmas.c
> @@ -431,9 +431,6 @@ static void palmas_power_off(void)
>  	unsigned int addr;
>  	int ret, slave;
>  
> -	if (!palmas_dev)
> -		return;
> -
>  	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
>  	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
>  

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 3/5] mfd: palmas: Reset the POWERHOLD mux during power off

[Lee Jones]

On Thu, 10 Nov 2016, Keerthy wrote:

> POWERHOLD signal has higher priority  over the DEV_ON bit.
> So power off will not happen if the POWERHOLD is held high.
> Hence reset the MUX to GPIO_7 mode to release the POWERHOLD
> and the DEV_ON bit to take effect to power off the PMIC.
> 
> PMIC Power off happens in dire situations like thermal shutdown
> so irrespective of the POWERHOLD setting go ahead and turn off
> the powerhold.  Currently poweroff is broken on boards that have
> powerhold enabled. This fixes poweroff on those boards.
> 
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
> 
> Changes in v2:
> 
>   * Changed pr_err to dev_err
>   * removed redundant boolean variable override-powerhold
> 
>  drivers/mfd/palmas.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
> index ee9e9ea..da90124 100644
> --- a/drivers/mfd/palmas.c
> +++ b/drivers/mfd/palmas.c
> @@ -430,6 +430,20 @@ static void palmas_power_off(void)
>  {
>  	unsigned int addr;
>  	int ret, slave;
> +	struct device_node *np = palmas_dev->dev->of_node;
> +
> +	if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
> +		addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
> +					  PALMAS_PRIMARY_SECONDARY_PAD2);
> +		slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
> +
> +		ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
> +				PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
> +		if (ret)
> +			dev_err(palmas_dev->dev,
> +				"Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
> +				ret);
> +	}
>  
>  	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
>  	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Keerthy]

On Tuesday 15 November 2016 05:38 AM, Tony Lindgren wrote:
> * Keerthy <j-keerthy@ti.com> [161109 21:10]:
>> The PMICs have POWERHOLD set by default which prevents PMIC shutdown
>> even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
>> So to enable pmic power off this property lets one over ride the default
>> value and enable pmic power off.
>
> This should not cause merge conflicts so probably best to merge along
> with the driver changes:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
>
> If you guys want me to pick up this separately let me know.

Hi Lee Jones,

Are you planning to pull DT and Documentation patches as well?

Regards,
Keerthy
>
> Regards,
>
> Tony
>

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Keerthy]

On Wednesday 23 November 2016 02:03 PM, Lee Jones wrote:
> On Wed, 23 Nov 2016, Keerthy wrote:
>
>>
>>
>> On Tuesday 15 November 2016 05:38 AM, Tony Lindgren wrote:
>>> * Keerthy <j-keerthy@ti.com> [161109 21:10]:
>>>> The PMICs have POWERHOLD set by default which prevents PMIC shutdown
>>>> even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
>>>> So to enable pmic power off this property lets one over ride the default
>>>> value and enable pmic power off.
>>>
>>> This should not cause merge conflicts so probably best to merge along
>>> with the driver changes:
>>>
>>> Acked-by: Tony Lindgren <tony@atomide.com>
>>>
>>> If you guys want me to pick up this separately let me know.
>>
>> Hi Lee Jones,
>>
>> Are you planning to pull DT and Documentation patches as well?
>
> No need.  They can be safely applied to their own subsystems.

Okay. Thanks for the response.

Tony,

Hope you can pull the DT patches.

>

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Lee Jones]

On Wed, 23 Nov 2016, Keerthy wrote:

> 
> 
> On Tuesday 15 November 2016 05:38 AM, Tony Lindgren wrote:
> > * Keerthy <j-keerthy@ti.com> [161109 21:10]:
> > > The PMICs have POWERHOLD set by default which prevents PMIC shutdown
> > > even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
> > > So to enable pmic power off this property lets one over ride the default
> > > value and enable pmic power off.
> > 
> > This should not cause merge conflicts so probably best to merge along
> > with the driver changes:
> > 
> > Acked-by: Tony Lindgren <tony@atomide.com>
> > 
> > If you guys want me to pick up this separately let me know.
> 
> Hi Lee Jones,
> 
> Are you planning to pull DT and Documentation patches as well?

No need.  They can be safely applied to their own subsystems.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Tony Lindgren]

* Keerthy <j-keerthy@ti.com> [161123 00:33]:
> On Wednesday 23 November 2016 02:03 PM, Lee Jones wrote:
> > On Wed, 23 Nov 2016, Keerthy wrote:
> > > On Tuesday 15 November 2016 05:38 AM, Tony Lindgren wrote:
> > > > * Keerthy <j-keerthy@ti.com> [161109 21:10]:
> > > > > The PMICs have POWERHOLD set by default which prevents PMIC shutdown
> > > > > even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
> > > > > So to enable pmic power off this property lets one over ride the default
> > > > > value and enable pmic power off.
> > > > 
> > > > This should not cause merge conflicts so probably best to merge along
> > > > with the driver changes:
> > > > 
> > > > Acked-by: Tony Lindgren <tony@atomide.com>
> > > > 
> > > > If you guys want me to pick up this separately let me know.
> > > 
> > > Hi Lee Jones,
> > > 
> > > Are you planning to pull DT and Documentation patches as well?
> > 
> > No need.  They can be safely applied to their own subsystems.
> 
> Okay. Thanks for the response.
> 
> Tony,
> 
> Hope you can pull the DT patches.

Applying both into omap-for-v4.10/dt thanks. Please send dts changes
seprately next time if there are no dependencies. This leaves out
the second guessing who should apply what.

Regards,

Tony

Re: [PATCH v2 4/5] arm: dts: am57xx-beagle-x15-common: Add overide powerhold property

[Keerthy]

On Wednesday 23 November 2016 09:38 PM, Tony Lindgren wrote:
> * Keerthy <j-keerthy@ti.com> [161123 00:33]:
>> On Wednesday 23 November 2016 02:03 PM, Lee Jones wrote:
>>> On Wed, 23 Nov 2016, Keerthy wrote:
>>>> On Tuesday 15 November 2016 05:38 AM, Tony Lindgren wrote:
>>>>> * Keerthy <j-keerthy@ti.com> [161109 21:10]:
>>>>>> The PMICs have POWERHOLD set by default which prevents PMIC shutdown
>>>>>> even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority.
>>>>>> So to enable pmic power off this property lets one over ride the default
>>>>>> value and enable pmic power off.
>>>>>
>>>>> This should not cause merge conflicts so probably best to merge along
>>>>> with the driver changes:
>>>>>
>>>>> Acked-by: Tony Lindgren <tony@atomide.com>
>>>>>
>>>>> If you guys want me to pick up this separately let me know.
>>>>
>>>> Hi Lee Jones,
>>>>
>>>> Are you planning to pull DT and Documentation patches as well?
>>>
>>> No need.  They can be safely applied to their own subsystems.
>>
>> Okay. Thanks for the response.
>>
>> Tony,
>>
>> Hope you can pull the DT patches.
>
> Applying both into omap-for-v4.10/dt thanks. Please send dts changes
> seprately next time if there are no dependencies. This leaves out
> the second guessing who should apply what.

Sure Tony.

>
> Regards,
>
> Tony
>

Re: [PATCH v2 1/5] Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition

[Keerthy]

On Tuesday 15 November 2016 07:13 AM, Rob Herring wrote:
> On Thu, Nov 10, 2016 at 10:39:16AM +0530, Keerthy wrote:
>> GPIO7 is configured in POWERHOLD mode which has higher priority
>> over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
>> bit is turned off. This property enables driver to over ride the
>> POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
>> scenarios.
>>
>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>> ---
>>  Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>
> Acked-by: Rob Herring <robh@kernel.org>

Tony,

Are you planning to pick this one as well?

- Keerthy
>

Re: [PATCH v2 1/5] Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition

[Lee Jones]

On Thu, 24 Nov 2016, Keerthy wrote:

> 
> 
> On Tuesday 15 November 2016 07:13 AM, Rob Herring wrote:
> > On Thu, Nov 10, 2016 at 10:39:16AM +0530, Keerthy wrote:
> > > GPIO7 is configured in POWERHOLD mode which has higher priority
> > > over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
> > > bit is turned off. This property enables driver to over ride the
> > > POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
> > > scenarios.
> > > 
> > > Signed-off-by: Keerthy <j-keerthy@ti.com>
> > > ---
> > >  Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++
> > >  1 file changed, 9 insertions(+)
> > 
> > Acked-by: Rob Herring <robh@kernel.org>
> 
> Tony,
> 
> Are you planning to pick this one as well?

This should be taken by LinusW.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 1/5] Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition

[Keerthy]

On Thursday 24 November 2016 02:15 PM, Lee Jones wrote:
> On Thu, 24 Nov 2016, Keerthy wrote:
>
>>
>>
>> On Tuesday 15 November 2016 07:13 AM, Rob Herring wrote:
>>> On Thu, Nov 10, 2016 at 10:39:16AM +0530, Keerthy wrote:
>>>> GPIO7 is configured in POWERHOLD mode which has higher priority
>>>> over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
>>>> bit is turned off. This property enables driver to over ride the
>>>> POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
>>>> scenarios.
>>>>
>>>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>>>> ---
>>>>  Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++
>>>>  1 file changed, 9 insertions(+)
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Tony,
>>
>> Are you planning to pick this one as well?
>
> This should be taken by LinusW.

Okay. I will post this separately.

>

Re: [PATCH v2 3/5] mfd: palmas: Reset the POWERHOLD mux during power off

[Keerthy]

On Tuesday 22 November 2016 06:33 PM, Lee Jones wrote:
> On Thu, 10 Nov 2016, Keerthy wrote:
> 
>> POWERHOLD signal has higher priority  over the DEV_ON bit.
>> So power off will not happen if the POWERHOLD is held high.
>> Hence reset the MUX to GPIO_7 mode to release the POWERHOLD
>> and the DEV_ON bit to take effect to power off the PMIC.
>>
>> PMIC Power off happens in dire situations like thermal shutdown
>> so irrespective of the POWERHOLD setting go ahead and turn off
>> the powerhold.  Currently poweroff is broken on boards that have
>> powerhold enabled. This fixes poweroff on those boards.
>>
>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>> ---
>>
>> Changes in v2:
>>
>>   * Changed pr_err to dev_err
>>   * removed redundant boolean variable override-powerhold
>>
>>  drivers/mfd/palmas.c | 14 ++++++++++++++
>>  1 file changed, 14 insertions(+)
> 
> Applied, thanks.

Lee Jones,

For some strange reason this patch is missing!
The other patch in the series is applied through mfd tree but somehow
this particular patch is missed out.

https://patchwork.kernel.org/patch/9420631/ is applied.

https://patchwork.kernel.org/patch/9420655/ is not.

I tried applying this very patch and it applies cleanly on the next
branch. Let me know if you want me to send this again on top of latest
next branch.

- Keerthy

> 
>> diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
>> index ee9e9ea..da90124 100644
>> --- a/drivers/mfd/palmas.c
>> +++ b/drivers/mfd/palmas.c
>> @@ -430,6 +430,20 @@ static void palmas_power_off(void)
>>  {
>>  	unsigned int addr;
>>  	int ret, slave;
>> +	struct device_node *np = palmas_dev->dev->of_node;
>> +
>> +	if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
>> +		addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
>> +					  PALMAS_PRIMARY_SECONDARY_PAD2);
>> +		slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
>> +
>> +		ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
>> +				PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
>> +		if (ret)
>> +			dev_err(palmas_dev->dev,
>> +				"Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
>> +				ret);
>> +	}
>>  
>>  	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
>>  	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
> 

Re: [PATCH v2 3/5] mfd: palmas: Reset the POWERHOLD mux during power off

[Lee Jones]

On Fri, 24 Mar 2017, Keerthy wrote:

> 
> 
> On Tuesday 22 November 2016 06:33 PM, Lee Jones wrote:
> > On Thu, 10 Nov 2016, Keerthy wrote:
> > 
> >> POWERHOLD signal has higher priority  over the DEV_ON bit.
> >> So power off will not happen if the POWERHOLD is held high.
> >> Hence reset the MUX to GPIO_7 mode to release the POWERHOLD
> >> and the DEV_ON bit to take effect to power off the PMIC.
> >>
> >> PMIC Power off happens in dire situations like thermal shutdown
> >> so irrespective of the POWERHOLD setting go ahead and turn off
> >> the powerhold.  Currently poweroff is broken on boards that have
> >> powerhold enabled. This fixes poweroff on those boards.
> >>
> >> Signed-off-by: Keerthy <j-keerthy@ti.com>
> >> ---
> >>
> >> Changes in v2:
> >>
> >>   * Changed pr_err to dev_err
> >>   * removed redundant boolean variable override-powerhold
> >>
> >>  drivers/mfd/palmas.c | 14 ++++++++++++++
> >>  1 file changed, 14 insertions(+)
> > 
> > Applied, thanks.
> 
> Lee Jones,
> 
> For some strange reason this patch is missing!
> The other patch in the series is applied through mfd tree but somehow
> this particular patch is missed out.
> 
> https://patchwork.kernel.org/patch/9420631/ is applied.
> 
> https://patchwork.kernel.org/patch/9420655/ is not.
> 
> I tried applying this very patch and it applies cleanly on the next
> branch. Let me know if you want me to send this again on top of latest
> next branch.

Sorry about this.

Reapplied and re-pushed.

> >> diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
> >> index ee9e9ea..da90124 100644
> >> --- a/drivers/mfd/palmas.c
> >> +++ b/drivers/mfd/palmas.c
> >> @@ -430,6 +430,20 @@ static void palmas_power_off(void)
> >>  {
> >>  	unsigned int addr;
> >>  	int ret, slave;
> >> +	struct device_node *np = palmas_dev->dev->of_node;
> >> +
> >> +	if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
> >> +		addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
> >> +					  PALMAS_PRIMARY_SECONDARY_PAD2);
> >> +		slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
> >> +
> >> +		ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
> >> +				PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
> >> +		if (ret)
> >> +			dev_err(palmas_dev->dev,
> >> +				"Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
> >> +				ret);
> >> +	}
> >>  
> >>  	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
> >>  	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
> > 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 3/5] mfd: palmas: Reset the POWERHOLD mux during power off

[Keerthy]

On Friday 24 March 2017 05:00 PM, Lee Jones wrote:
> On Fri, 24 Mar 2017, Keerthy wrote:
> 
>>
>>
>> On Tuesday 22 November 2016 06:33 PM, Lee Jones wrote:
>>> On Thu, 10 Nov 2016, Keerthy wrote:
>>>
>>>> POWERHOLD signal has higher priority  over the DEV_ON bit.
>>>> So power off will not happen if the POWERHOLD is held high.
>>>> Hence reset the MUX to GPIO_7 mode to release the POWERHOLD
>>>> and the DEV_ON bit to take effect to power off the PMIC.
>>>>
>>>> PMIC Power off happens in dire situations like thermal shutdown
>>>> so irrespective of the POWERHOLD setting go ahead and turn off
>>>> the powerhold.  Currently poweroff is broken on boards that have
>>>> powerhold enabled. This fixes poweroff on those boards.
>>>>
>>>> Signed-off-by: Keerthy <j-keerthy@ti.com>
>>>> ---
>>>>
>>>> Changes in v2:
>>>>
>>>>   * Changed pr_err to dev_err
>>>>   * removed redundant boolean variable override-powerhold
>>>>
>>>>  drivers/mfd/palmas.c | 14 ++++++++++++++
>>>>  1 file changed, 14 insertions(+)
>>>
>>> Applied, thanks.
>>
>> Lee Jones,
>>
>> For some strange reason this patch is missing!
>> The other patch in the series is applied through mfd tree but somehow
>> this particular patch is missed out.
>>
>> https://patchwork.kernel.org/patch/9420631/ is applied.
>>
>> https://patchwork.kernel.org/patch/9420655/ is not.
>>
>> I tried applying this very patch and it applies cleanly on the next
>> branch. Let me know if you want me to send this again on top of latest
>> next branch.
> 
> Sorry about this.
> 
> Reapplied and re-pushed.

Thanks Lee Jones.

> 
>>>> diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
>>>> index ee9e9ea..da90124 100644
>>>> --- a/drivers/mfd/palmas.c
>>>> +++ b/drivers/mfd/palmas.c
>>>> @@ -430,6 +430,20 @@ static void palmas_power_off(void)
>>>>  {
>>>>  	unsigned int addr;
>>>>  	int ret, slave;
>>>> +	struct device_node *np = palmas_dev->dev->of_node;
>>>> +
>>>> +	if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
>>>> +		addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
>>>> +					  PALMAS_PRIMARY_SECONDARY_PAD2);
>>>> +		slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
>>>> +
>>>> +		ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
>>>> +				PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
>>>> +		if (ret)
>>>> +			dev_err(palmas_dev->dev,
>>>> +				"Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
>>>> +				ret);
>>>> +	}
>>>>  
>>>>  	slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
>>>>  	addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);
>>>
>