diff mbox

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

Message ID 1442372732-27434-2-git-send-email-wens@csie.org
State New, archived
Headers show

Commit Message

Chen-Yu Tsai Sept. 16, 2015, 3:05 a.m. UTC
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(-)

Comments

Maxime Ripard Sept. 16, 2015, 10:03 a.m. UTC | #1
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
Mark Brown Sept. 19, 2015, 6:06 p.m. UTC | #2
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?
Lee Jones Sept. 20, 2015, 4:17 a.m. UTC | #3
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
Chen-Yu Tsai Sept. 20, 2015, 10:17 a.m. UTC | #4
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones Sept. 22, 2015, 10:06 p.m. UTC | #5
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
> >
diff mbox

Patch

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