diff mbox series

[4/4] arm: dts: zynq: Replace 'io-standard' with 'power-source' property

Message ID 1626868353-96475-5-git-send-email-lakshmi.sai.krishna.potthuri@xilinx.com
State New
Headers show
Series pinctrl: pinctrl-zynq: yaml conversion and minor driver updates | expand

Commit Message

Sai Krishna Potthuri July 21, 2021, 11:52 a.m. UTC
Replace 'io-standard' property with 'power-source' property in all zynq dts
files to be in sync with Zynq pinctrl driver.

Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
---
 arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----
 arch/arm/boot/dts/zynq-microzed.dts |  2 +-
 arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------
 arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

Comments

Rob Herring July 29, 2021, 7:59 p.m. UTC | #1
On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:
> Replace 'io-standard' property with 'power-source' property in all zynq dts
> files to be in sync with Zynq pinctrl driver.
> 
> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> ---
>  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----
>  arch/arm/boot/dts/zynq-microzed.dts |  2 +-
>  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------
>  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------
>  4 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts
> index b0b836aedd76..be7eae611fb7 100644
> --- a/arch/arm/boot/dts/zynq-ebaz4205.dts
> +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts
> @@ -57,7 +57,7 @@
>  
>  		conf {
>  			groups = "gpio0_20_grp", "gpio0_32_grp";
> -			io-standard = <3>;
> +			power-source = <3>;

This will break using a new DT with a kernel without patch 3.
Michal Simek July 30, 2021, 4:59 a.m. UTC | #2
On 7/29/21 9:59 PM, Rob Herring wrote:
> On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:
>> Replace 'io-standard' property with 'power-source' property in all zynq dts
>> files to be in sync with Zynq pinctrl driver.
>>
>> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
>> ---
>>  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----
>>  arch/arm/boot/dts/zynq-microzed.dts |  2 +-
>>  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------
>>  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------
>>  4 files changed, 24 insertions(+), 24 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts
>> index b0b836aedd76..be7eae611fb7 100644
>> --- a/arch/arm/boot/dts/zynq-ebaz4205.dts
>> +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts
>> @@ -57,7 +57,7 @@
>>  
>>  		conf {
>>  			groups = "gpio0_20_grp", "gpio0_32_grp";
>> -			io-standard = <3>;
>> +			power-source = <3>;
> 
> This will break using a new DT with a kernel without patch 3.
> 

What do you suggest? Not to update any old DT?

Thanks,
Michal
Linus Walleij July 30, 2021, 12:43 p.m. UTC | #3
On Thu, Jul 29, 2021 at 9:59 PM Rob Herring <robh@kernel.org> wrote:
> On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:
> > Replace 'io-standard' property with 'power-source' property in all zynq dts
> > files to be in sync with Zynq pinctrl driver.
> >
> > Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> > ---
> >  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----
> >  arch/arm/boot/dts/zynq-microzed.dts |  2 +-
> >  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------
> >  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------
> >  4 files changed, 24 insertions(+), 24 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts
> > index b0b836aedd76..be7eae611fb7 100644
> > --- a/arch/arm/boot/dts/zynq-ebaz4205.dts
> > +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts
> > @@ -57,7 +57,7 @@
> >
> >               conf {
> >                       groups = "gpio0_20_grp", "gpio0_32_grp";
> > -                     io-standard = <3>;
> > +                     power-source = <3>;
>
> This will break using a new DT with a kernel without patch 3.

The old (Linux) kernel never supported the "io-standard" property
anyway.

Unless someone is running som BSD or Windows with support for
this property it can be merged by the quality of zero real-world
impacts (no-one there to hear the tree fall in the forest).

Sai Krishna: correct?

Yours,
Linus Walleij
Michal Simek July 30, 2021, 12:46 p.m. UTC | #4
On 7/30/21 2:43 PM, Linus Walleij wrote:
> On Thu, Jul 29, 2021 at 9:59 PM Rob Herring <robh@kernel.org> wrote:

>> On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:

>>> Replace 'io-standard' property with 'power-source' property in all zynq dts

>>> files to be in sync with Zynq pinctrl driver.

>>>

>>> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>

>>> ---

>>>  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----

>>>  arch/arm/boot/dts/zynq-microzed.dts |  2 +-

>>>  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------

>>>  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------

>>>  4 files changed, 24 insertions(+), 24 deletions(-)

>>>

>>> diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts

>>> index b0b836aedd76..be7eae611fb7 100644

>>> --- a/arch/arm/boot/dts/zynq-ebaz4205.dts

>>> +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts

>>> @@ -57,7 +57,7 @@

>>>

>>>               conf {

>>>                       groups = "gpio0_20_grp", "gpio0_32_grp";

>>> -                     io-standard = <3>;

>>> +                     power-source = <3>;

>>

>> This will break using a new DT with a kernel without patch 3.

> 

> The old (Linux) kernel never supported the "io-standard" property

> anyway.

> 

> Unless someone is running som BSD or Windows with support for

> this property it can be merged by the quality of zero real-world

> impacts (no-one there to hear the tree fall in the forest).

> 

> Sai Krishna: correct?


Linux Zynq pinctrl driver and in tree dts files are using io-standard
properties at least from 2015.

M
Michal Simek Aug. 2, 2021, 5:21 p.m. UTC | #5
po 2. 8. 2021 v 15:20 odesílatel Linus Walleij
<linus.walleij@linaro.org> napsal:
>

> On Fri, Jul 30, 2021 at 2:46 PM Michal Simek <michal.simek@xilinx.com> wrote:

>

> > Linux Zynq pinctrl driver and in tree dts files are using io-standard

> > properties at least from 2015.

>

> Ooops my wrong.

>

> What about supporting both the new property and io-standard as

> a fallback, simply?


That's exactly what I have Sai to do and PIN_CONFIG_IOSTANDARD is still there.

https://lore.kernel.org/linux-arm-kernel/1626868353-96475-1-git-send-email-lakshmi.sai.krishna.potthuri@xilinx.com/T/#md7d304d9d8f746e51d909237b9073f2ae8930543

But IIRC I have also asked to show any warning message when io
standard property is used to convert to new property.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
Rob Herring Aug. 2, 2021, 5:29 p.m. UTC | #6
On Thu, Jul 29, 2021 at 10:59 PM Michal Simek <michal.simek@xilinx.com> wrote:
>

>

>

> On 7/29/21 9:59 PM, Rob Herring wrote:

> > On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:

> >> Replace 'io-standard' property with 'power-source' property in all zynq dts

> >> files to be in sync with Zynq pinctrl driver.

> >>

> >> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>

> >> ---

> >>  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----

> >>  arch/arm/boot/dts/zynq-microzed.dts |  2 +-

> >>  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------

> >>  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------

> >>  4 files changed, 24 insertions(+), 24 deletions(-)

> >>

> >> diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts

> >> index b0b836aedd76..be7eae611fb7 100644

> >> --- a/arch/arm/boot/dts/zynq-ebaz4205.dts

> >> +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts

> >> @@ -57,7 +57,7 @@

> >>

> >>              conf {

> >>                      groups = "gpio0_20_grp", "gpio0_32_grp";

> >> -                    io-standard = <3>;

> >> +                    power-source = <3>;

> >

> > This will break using a new DT with a kernel without patch 3.

> >

>

> What do you suggest? Not to update any old DT?


Your options are don't change the dts files, patch 3 needs to go to
stable kernels, or you document the breakage (if you don't care).

Rob
Michal Simek Aug. 5, 2021, 7:52 a.m. UTC | #7
On 8/2/21 7:29 PM, Rob Herring wrote:
> On Thu, Jul 29, 2021 at 10:59 PM Michal Simek <michal.simek@xilinx.com> wrote:
>>
>>
>>
>> On 7/29/21 9:59 PM, Rob Herring wrote:
>>> On Wed, Jul 21, 2021 at 05:22:33PM +0530, Sai Krishna Potthuri wrote:
>>>> Replace 'io-standard' property with 'power-source' property in all zynq dts
>>>> files to be in sync with Zynq pinctrl driver.
>>>>
>>>> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
>>>> ---
>>>>  arch/arm/boot/dts/zynq-ebaz4205.dts |  8 ++++----
>>>>  arch/arm/boot/dts/zynq-microzed.dts |  2 +-
>>>>  arch/arm/boot/dts/zynq-zc702.dts    | 20 ++++++++++----------
>>>>  arch/arm/boot/dts/zynq-zc706.dts    | 18 +++++++++---------
>>>>  4 files changed, 24 insertions(+), 24 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts
>>>> index b0b836aedd76..be7eae611fb7 100644
>>>> --- a/arch/arm/boot/dts/zynq-ebaz4205.dts
>>>> +++ b/arch/arm/boot/dts/zynq-ebaz4205.dts
>>>> @@ -57,7 +57,7 @@
>>>>
>>>>              conf {
>>>>                      groups = "gpio0_20_grp", "gpio0_32_grp";
>>>> -                    io-standard = <3>;
>>>> +                    power-source = <3>;
>>>
>>> This will break using a new DT with a kernel without patch 3.
>>>
>>
>> What do you suggest? Not to update any old DT?
> 
> Your options are don't change the dts files, patch 3 needs to go to
> stable kernels, or you document the breakage (if you don't care).

There is no intention to go to stable kernel and I don't think this is
stable material. Linus has applied 3 patches and this one should go via
my tree. It means I will make sure that this DT change will be in the
tree when pinctrl changes are applied.

Thanks,
Michal
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/zynq-ebaz4205.dts b/arch/arm/boot/dts/zynq-ebaz4205.dts
index b0b836aedd76..be7eae611fb7 100644
--- a/arch/arm/boot/dts/zynq-ebaz4205.dts
+++ b/arch/arm/boot/dts/zynq-ebaz4205.dts
@@ -57,7 +57,7 @@ 
 
 		conf {
 			groups = "gpio0_20_grp", "gpio0_32_grp";
-			io-standard = <3>;
+			power-source = <3>;
 			slew-rate = <0>;
 		};
 
@@ -75,7 +75,7 @@ 
 
 		conf {
 			groups = "sdio0_2_grp";
-			io-standard = <3>;
+			power-source = <3>;
 			slew-rate = <0>;
 			bias-disable;
 		};
@@ -87,7 +87,7 @@ 
 
 		conf-cd {
 			groups = "gpio0_34_grp";
-			io-standard = <3>;
+			power-source = <3>;
 			slew-rate = <0>;
 			bias-high-impedance;
 			bias-pull-up;
@@ -102,7 +102,7 @@ 
 
 		conf {
 			groups = "uart1_4_grp";
-			io-standard = <3>;
+			power-source = <3>;
 			slew-rate = <0>;
 		};
 
diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
index 6ed84fb15902..f44a4464943b 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -71,7 +71,7 @@ 
 		conf {
 			groups = "usb0_0_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index cf70aff26c66..cf1e1cc3d132 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -206,7 +206,7 @@ 
 		conf {
 			groups = "can0_9_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {
@@ -229,7 +229,7 @@ 
 		conf {
 			groups = "ethernet0_0_grp";
 			slew-rate = <0>;
-			io-standard = <4>;
+			power-source = <4>;
 		};
 
 		conf-rx {
@@ -252,7 +252,7 @@ 
 		conf-mdio {
 			groups = "mdio0_0_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 			bias-disable;
 		};
 	};
@@ -270,7 +270,7 @@ 
 				 "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp",
 				 "gpio0_13_grp", "gpio0_14_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-pull-up {
@@ -294,7 +294,7 @@ 
 			groups = "i2c0_10_grp";
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 	};
 
@@ -307,7 +307,7 @@ 
 		conf {
 			groups = "sdio0_2_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 			bias-disable;
 		};
 
@@ -321,7 +321,7 @@ 
 			bias-high-impedance;
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		mux-wp {
@@ -334,7 +334,7 @@ 
 			bias-high-impedance;
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 	};
 
@@ -347,7 +347,7 @@ 
 		conf {
 			groups = "uart1_10_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {
@@ -370,7 +370,7 @@ 
 		conf {
 			groups = "usb0_0_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 77943c16d33f..d21e3ae4ebb2 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -150,7 +150,7 @@ 
 		conf {
 			groups = "ethernet0_0_grp";
 			slew-rate = <0>;
-			io-standard = <4>;
+			power-source = <4>;
 		};
 
 		conf-rx {
@@ -173,7 +173,7 @@ 
 		conf-mdio {
 			groups = "mdio0_0_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 			bias-disable;
 		};
 	};
@@ -187,7 +187,7 @@ 
 		conf {
 			groups = "gpio0_7_grp", "gpio0_46_grp", "gpio0_47_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-pull-up {
@@ -211,7 +211,7 @@ 
 			groups = "i2c0_10_grp";
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 	};
 
@@ -224,7 +224,7 @@ 
 		conf {
 			groups = "sdio0_2_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 			bias-disable;
 		};
 
@@ -238,7 +238,7 @@ 
 			bias-high-impedance;
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		mux-wp {
@@ -251,7 +251,7 @@ 
 			bias-high-impedance;
 			bias-pull-up;
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 	};
 
@@ -264,7 +264,7 @@ 
 		conf {
 			groups = "uart1_10_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {
@@ -287,7 +287,7 @@ 
 		conf {
 			groups = "usb0_0_grp";
 			slew-rate = <0>;
-			io-standard = <1>;
+			power-source = <1>;
 		};
 
 		conf-rx {