[PATCH 0/3] regulators: axp20x: Rename AXP221 DC1SW and DC5LDO supply names

[PATCH 0/3] regulators: axp20x: Rename AXP221 DC1SW and DC5LDO supply names

[Chen-Yu Tsai]

Hi everyone,

This series renames regulator supply names for DC1SW and DC5LDO for
the AXP221. These 2 are secondary outputs for DCDC1 and DCDC5 buck
regulators, respectively, so they are connected to them internally.
There's no external input pin to name the supplies after.

When I originally did the support, I used the parent regulator's name
for the supply name. However this results in a misleading dts:

	axp221: pmic@68 {
		dcdc1-supply = <&dcdc1>;
		dcdc5-supply = <&dcdc5>;

		dcdc1: dcdc1 {
			...
		};

		...
	};

At first glance, one might interpret it as "DCDC1 supplies itself".
Indeed, Maxime raised this issue.

This series renames the supply names to the regulator names themselves,
or "dc1sw-supply" and "dc5ldo-supply" respectively:

	axp221: pmic@68 {
		dc1sw-supply = <&dcdc1>;
		dc5ldo-supply = <&dcdc5>;
		...
	};

Renaming these shouldn't result in any problems in the real world.
All the board designs we've seen have DCDC1 supplying a common 3/3.3V
rail, and DCDC5 supplying 1.5V for DDR3 SDRAM. These 2 would have
"always-on" set, so even if the rename results in the secondary
regulator outputs being decoupled from the primary in the software
implementation, it would just be a representation issue. Function-wise,
it would function as before. On the Linux side, no one is actually
using the secondary outputs yet.

Patch 1 renames the supply names in the axp20x DT bindings.

Patch 2 updates the axp20x regulator driver.

Patch 3 updates the only dts, the Hummingbird A31, that uses these
bindings.

If everything's ok, could we merge the first 2 patches through the
regulator tree, and the 3rd through the sunxi tree?

Thanks.


Regards,
ChenYu


Chen-Yu Tsai (3):
  mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO
    regulators
  regulators: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO
  ARM: dts: sun6i: hummingbird: Rename AXP221 DC1SW and DC5LDO supply
    names

 Documentation/devicetree/bindings/mfd/axp20x.txt | 4 ++--
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts      | 4 ++--
 drivers/regulator/axp20x-regulator.c             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.5.1

[PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Chen-Yu Tsai]

The DC1SW and DC5LDO regulators in the AXP221 are internally chained
to DCDC1 and DCDC5, hence the names. The original bindings used the
parent regulator names for the supply regulator property. This causes
some confusion when we actually use it in the dts:

	axp221 {
		/* self supplying? */
		dcdc1-supply = <&dcdc1>;
		dcdc5-supply = <&dcdc5>;

		dcdc1: dcdc1 {
			...
		};

		dcdc5: dcdc5 {
			...
		};
	};

Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
respectively.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 Documentation/devicetree/bindings/mfd/axp20x.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
index 41811223e5be..8e79252b1e7c 100644
--- a/Documentation/devicetree/bindings/mfd/axp20x.txt
+++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
@@ -60,8 +60,8 @@ DCDC2		: DC-DC buck	: vin2-supply
 DCDC3		: DC-DC	buck	: vin3-supply
 DCDC4		: DC-DC	buck	: vin4-supply
 DCDC5		: DC-DC	buck	: vin5-supply
-DC1SW		: On/Off Switch	: dcdc1-supply		: DCDC1 secondary output
-DC5LDO		: LDO		: dcdc5-supply		: input from DCDC5
+DC1SW		: On/Off Switch	: dc1sw-supply		: DCDC1 secondary output
+DC5LDO		: LDO		: dc5ldo-supply		: input from DCDC5
 ALDO1		: LDO		: aldoin-supply		: shared supply
 ALDO2		: LDO		: aldoin-supply		: shared supply
 ALDO3		: LDO		: aldoin-supply		: shared supply
-- 
2.5.1

[PATCH 2/3] regulators: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO

[Chen-Yu Tsai]

The DC1SW and DC5LDO regulators in the AXP221 are internally chained
to DCDC1 and DCDC5, hence the names. The original bindings used the
parent regulator names for the supply regulator property. This causes
some confusion when we actually use it in the dts:

	axp221 {
		/* self supplying? */
		dcdc1-supply = <&dcdc1>;
		dcdc5-supply = <&dcdc5>;

		dcdc1: dcdc1 {
			...
		};

		dcdc5: dcdc5 {
			...
		};
	};

Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
respectively.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/regulator/axp20x-regulator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 01bf3476a791..27ebee8e224c 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -196,10 +196,10 @@ static const struct regulator_desc axp22x_regulators[] = {
 	AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,
 		 AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(4)),
 	/* secondary switchable output of DCDC1 */
-	AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100,
+	AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dc1sw", 1600, 3400, 100,
 		    AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)),
 	/* LDO regulator internally chained to DCDC5 */
-	AXP_DESC(AXP22X, DC5LDO, "dc5ldo", "dcdc5", 700, 1400, 100,
+	AXP_DESC(AXP22X, DC5LDO, "dc5ldo", "dc5ldo", 700, 1400, 100,
 		 AXP22X_DC5LDO_V_OUT, 0x7, AXP22X_PWR_OUT_CTRL1, BIT(0)),
 	AXP_DESC(AXP22X, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
 		 AXP22X_ALDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(6)),
-- 
2.5.1

[PATCH 3/3] ARM: dts: sun6i: hummingbird: Rename AXP221 DC1SW and DC5LDO supply names

[Chen-Yu Tsai]

"dcdc1-supply" and "dcdc5-supply" are renamed to "dc1sw-supply" and
"dc5ldo-supply" respectively. Update the dts to reflect the new supply
names for the regulators.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 06d9391ca30e..144f563a3d6d 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -178,8 +178,8 @@
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		interrupt-controller;
 		#interrupt-cells = <1>;
-		dcdc1-supply = <&vcc_3v0>;
-		dcdc5-supply = <&vcc_dram>;
+		dc1sw-supply = <&vcc_3v0>;
+		dc5ldo-supply = <&vcc_dram>;
 
 		regulators {
 			x-powers,dcdc-freq = <3000>;
-- 
2.5.1

Re: [PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Maxime Ripard]

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

On Wed, Sep 16, 2015 at 11:05:30AM +0800, Chen-Yu Tsai wrote:
> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
> to DCDC1 and DCDC5, hence the names. The original bindings used the
> parent regulator names for the supply regulator property. This causes
> some confusion when we actually use it in the dts:
> 
> 	axp221 {
> 		/* self supplying? */
> 		dcdc1-supply = <&dcdc1>;
> 		dcdc5-supply = <&dcdc5>;
> 
> 		dcdc1: dcdc1 {
> 			...
> 		};
> 
> 		dcdc5: dcdc5 {
> 			...
> 		};
> 	};
> 
> Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
> respectively.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

Re: [PATCH 2/3] regulators: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO

[Maxime Ripard]

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

On Wed, Sep 16, 2015 at 11:05:31AM +0800, Chen-Yu Tsai wrote:
> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
> to DCDC1 and DCDC5, hence the names. The original bindings used the
> parent regulator names for the supply regulator property. This causes
> some confusion when we actually use it in the dts:
> 
> 	axp221 {
> 		/* self supplying? */
> 		dcdc1-supply = <&dcdc1>;
> 		dcdc5-supply = <&dcdc5>;
> 
> 		dcdc1: dcdc1 {
> 			...
> 		};
> 
> 		dcdc5: dcdc5 {
> 			...
> 		};
> 	};
> 
> Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
> respectively.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

Re: [PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Mark Brown]

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

On Wed, Sep 16, 2015 at 11:05:30AM +0800, Chen-Yu Tsai wrote:
> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
> to DCDC1 and DCDC5, hence the names. The original bindings used the
> parent regulator names for the supply regulator property. This causes
> some confusion when we actually use it in the dts:

If these regulators are internally always connected to other regulators
in the same device why are we even representing their supplies in DT?

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

Re: [PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Lee Jones]

On Wed, 16 Sep 2015, Chen-Yu Tsai wrote:

> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
> to DCDC1 and DCDC5, hence the names. The original bindings used the
> parent regulator names for the supply regulator property. This causes
> some confusion when we actually use it in the dts:
> 
> 	axp221 {
> 		/* self supplying? */
> 		dcdc1-supply = <&dcdc1>;
> 		dcdc5-supply = <&dcdc5>;
> 
> 		dcdc1: dcdc1 {
> 			...
> 		};
> 
> 		dcdc5: dcdc5 {
> 			...
> 		};
> 	};
> 
> Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
> respectively.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  Documentation/devicetree/bindings/mfd/axp20x.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
> index 41811223e5be..8e79252b1e7c 100644
> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
> @@ -60,8 +60,8 @@ DCDC2		: DC-DC buck	: vin2-supply
>  DCDC3		: DC-DC	buck	: vin3-supply
>  DCDC4		: DC-DC	buck	: vin4-supply
>  DCDC5		: DC-DC	buck	: vin5-supply
> -DC1SW		: On/Off Switch	: dcdc1-supply		: DCDC1 secondary output
> -DC5LDO		: LDO		: dcdc5-supply		: input from DCDC5
> +DC1SW		: On/Off Switch	: dc1sw-supply		: DCDC1 secondary output
> +DC5LDO		: LDO		: dc5ldo-supply		: input from DCDC5
>  ALDO1		: LDO		: aldoin-supply		: shared supply
>  ALDO2		: LDO		: aldoin-supply		: shared supply
>  ALDO3		: LDO		: aldoin-supply		: shared supply

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

Re: [PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Chen-Yu Tsai]

Hi Lee,

On Sun, Sep 20, 2015 at 12:17 PM, Lee Jones <lee.jones@linaro.org> wrote:
> On Wed, 16 Sep 2015, Chen-Yu Tsai wrote:
>
>> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
>> to DCDC1 and DCDC5, hence the names. The original bindings used the
>> parent regulator names for the supply regulator property. This causes
>> some confusion when we actually use it in the dts:
>>
>>       axp221 {
>>               /* self supplying? */
>>               dcdc1-supply = <&dcdc1>;
>>               dcdc5-supply = <&dcdc5>;
>>
>>               dcdc1: dcdc1 {
>>                       ...
>>               };
>>
>>               dcdc5: dcdc5 {
>>                       ...
>>               };
>>       };
>>
>> Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
>> respectively.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>  Documentation/devicetree/bindings/mfd/axp20x.txt | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Applied, thanks.

Mark (in his reply) has a point. If these are internally connect, we
should just remove them from the bindings, and associate them in the
driver.

I'm looking into this. In the mean time, could you drop this one?

Thanks
ChenYu

>> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
>> index 41811223e5be..8e79252b1e7c 100644
>> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
>> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
>> @@ -60,8 +60,8 @@ DCDC2               : DC-DC buck    : vin2-supply
>>  DCDC3                : DC-DC buck    : vin3-supply
>>  DCDC4                : DC-DC buck    : vin4-supply
>>  DCDC5                : DC-DC buck    : vin5-supply
>> -DC1SW                : On/Off Switch : dcdc1-supply          : DCDC1 secondary output
>> -DC5LDO               : LDO           : dcdc5-supply          : input from DCDC5
>> +DC1SW                : On/Off Switch : dc1sw-supply          : DCDC1 secondary output
>> +DC5LDO               : LDO           : dc5ldo-supply         : input from DCDC5
>>  ALDO1                : LDO           : aldoin-supply         : shared supply
>>  ALDO2                : LDO           : aldoin-supply         : shared supply
>>  ALDO3                : LDO           : aldoin-supply         : shared supply
>
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 1/3] mfd: axp20x: Rename supply names for AXP221 DC1SW and DC5LDO regulators

[Lee Jones]

On Sun, 20 Sep 2015, Chen-Yu Tsai wrote:

> Hi Lee,
> 
> On Sun, Sep 20, 2015 at 12:17 PM, Lee Jones <lee.jones@linaro.org> wrote:
> > On Wed, 16 Sep 2015, Chen-Yu Tsai wrote:
> >
> >> The DC1SW and DC5LDO regulators in the AXP221 are internally chained
> >> to DCDC1 and DCDC5, hence the names. The original bindings used the
> >> parent regulator names for the supply regulator property. This causes
> >> some confusion when we actually use it in the dts:
> >>
> >>       axp221 {
> >>               /* self supplying? */
> >>               dcdc1-supply = <&dcdc1>;
> >>               dcdc5-supply = <&dcdc5>;
> >>
> >>               dcdc1: dcdc1 {
> >>                       ...
> >>               };
> >>
> >>               dcdc5: dcdc5 {
> >>                       ...
> >>               };
> >>       };
> >>
> >> Change them to the downstream regulator names, or "dc1sw" and "dc5ldo"
> >> respectively.
> >>
> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> >> ---
> >>  Documentation/devicetree/bindings/mfd/axp20x.txt | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Applied, thanks.
> 
> Mark (in his reply) has a point. If these are internally connect, we
> should just remove them from the bindings, and associate them in the
> driver.
> 
> I'm looking into this. In the mean time, could you drop this one?

Patch removed.

> >> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
> >> index 41811223e5be..8e79252b1e7c 100644
> >> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
> >> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
> >> @@ -60,8 +60,8 @@ DCDC2               : DC-DC buck    : vin2-supply
> >>  DCDC3                : DC-DC buck    : vin3-supply
> >>  DCDC4                : DC-DC buck    : vin4-supply
> >>  DCDC5                : DC-DC buck    : vin5-supply
> >> -DC1SW                : On/Off Switch : dcdc1-supply          : DCDC1 secondary output
> >> -DC5LDO               : LDO           : dcdc5-supply          : input from DCDC5
> >> +DC1SW                : On/Off Switch : dc1sw-supply          : DCDC1 secondary output
> >> +DC5LDO               : LDO           : dc5ldo-supply         : input from DCDC5
> >>  ALDO1                : LDO           : aldoin-supply         : shared supply
> >>  ALDO2                : LDO           : aldoin-supply         : shared supply
> >>  ALDO3                : LDO           : aldoin-supply         : shared supply
> >

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