riscv: dts: starfive: jh7110-milkv-mars sort properties

[PATCH] riscv: dts: starfive: jh7110-milkv-mars sort properties

Posted by E Shattow 2 months, 3 weeks ago

Improve style with node property order sort of common properties before
vendor prefixes

Signed-off-by: E Shattow <e@freeshell.de>
---
 arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
index 3bd62ab78523..fdaf6b4557da 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
@@ -12,9 +12,9 @@ / {
 };
 
 &gmac0 {
-	starfive,tx-use-rgmii-clk;
 	assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
 	assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
+	starfive,tx-use-rgmii-clk;
 	status = "okay";
 };
 
@@ -31,14 +31,14 @@ &pcie1 {
 };
 
 &phy0 {
-	motorcomm,tx-clk-adj-enabled;
+	rx-internal-delay-ps = <1500>;
+	tx-internal-delay-ps = <1500>;
+	motorcomm,rx-clk-drv-microamp = <3970>;
+	motorcomm,rx-data-drv-microamp = <2910>;
 	motorcomm,tx-clk-10-inverted;
 	motorcomm,tx-clk-100-inverted;
 	motorcomm,tx-clk-1000-inverted;
-	motorcomm,rx-clk-drv-microamp = <3970>;
-	motorcomm,rx-data-drv-microamp = <2910>;
-	rx-internal-delay-ps = <1500>;
-	tx-internal-delay-ps = <1500>;
+	motorcomm,tx-clk-adj-enabled;
 };
 
 &pwm {

base-commit: 155a3c003e555a7300d156a5252c004c392ec6b0
-- 
2.50.0

Re: [PATCH] riscv: dts: starfive: jh7110-milkv-mars sort properties

Posted by Emil Renner Berthing 2 months, 3 weeks ago

E Shattow wrote:
> Improve style with node property order sort of common properties before
> vendor prefixes
>
> Signed-off-by: E Shattow <e@freeshell.de>

Thanks!

Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>

> ---
>  arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
> index 3bd62ab78523..fdaf6b4557da 100644
> --- a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
> +++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
> @@ -12,9 +12,9 @@ / {
>  };
>
>  &gmac0 {
> -	starfive,tx-use-rgmii-clk;
>  	assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>;
>  	assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>;
> +	starfive,tx-use-rgmii-clk;
>  	status = "okay";
>  };
>
> @@ -31,14 +31,14 @@ &pcie1 {
>  };
>
>  &phy0 {
> -	motorcomm,tx-clk-adj-enabled;
> +	rx-internal-delay-ps = <1500>;
> +	tx-internal-delay-ps = <1500>;
> +	motorcomm,rx-clk-drv-microamp = <3970>;
> +	motorcomm,rx-data-drv-microamp = <2910>;
>  	motorcomm,tx-clk-10-inverted;
>  	motorcomm,tx-clk-100-inverted;
>  	motorcomm,tx-clk-1000-inverted;
> -	motorcomm,rx-clk-drv-microamp = <3970>;
> -	motorcomm,rx-data-drv-microamp = <2910>;
> -	rx-internal-delay-ps = <1500>;
> -	tx-internal-delay-ps = <1500>;
> +	motorcomm,tx-clk-adj-enabled;
>  };
>
>  &pwm {
>
> base-commit: 155a3c003e555a7300d156a5252c004c392ec6b0
> --
> 2.50.0
>

Re: [PATCH] riscv: dts: starfive: jh7110-milkv-mars sort properties

Posted by Conor Dooley 2 months, 3 weeks ago

On Wed, Jul 16, 2025 at 02:17:34AM -0700, Emil Renner Berthing wrote:
> E Shattow wrote:
> > Improve style with node property order sort of common properties before
> > vendor prefixes
> >
> > Signed-off-by: E Shattow <e@freeshell.de>
> 
> Thanks!
> 
> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>

I'm going to pick this up, but it may be very late for 6.17.

Re: [PATCH] riscv: dts: starfive: jh7110-milkv-mars sort properties

Posted by E Shattow 2 months, 3 weeks ago

On 7/16/25 08:28, Conor Dooley wrote:
> On Wed, Jul 16, 2025 at 02:17:34AM -0700, Emil Renner Berthing wrote:
>> E Shattow wrote:
>>> Improve style with node property order sort of common properties before
>>> vendor prefixes
>>>
>>> Signed-off-by: E Shattow <e@freeshell.de>
>>
>> Thanks!
>>
>> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
> 
> I'm going to pick this up, but it may be very late for 6.17.

Yes. The other questionable sort style in this dts I was looking at are
whether we want "compatible" before "model" in the root '/' node?  And
then why we have this common pattern of 'pinmux' (or pinctrl*)
prioritized firstly in the natural sort order, also pinctrl-names before
pinctrl-N is a common pattern that seems an arbitrary reversal of
natural sort order?

Thanks,

-E

Re: [PATCH] riscv: dts: starfive: jh7110-milkv-mars sort properties

Posted by Conor Dooley 2 months, 3 weeks ago

On Thu, Jul 17, 2025 at 12:06:57AM -0700, E Shattow wrote:
> 
> 
> On 7/16/25 08:28, Conor Dooley wrote:
> > On Wed, Jul 16, 2025 at 02:17:34AM -0700, Emil Renner Berthing wrote:
> >> E Shattow wrote:
> >>> Improve style with node property order sort of common properties before
> >>> vendor prefixes
> >>>
> >>> Signed-off-by: E Shattow <e@freeshell.de>
> >>
> >> Thanks!
> >>
> >> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
> > 
> > I'm going to pick this up, but it may be very late for 6.17.
> 
> Yes. The other questionable sort style in this dts I was looking at are
> whether we want "compatible" before "model" in the root '/' node?  And

I think usually model comes first, yeah. Whether that's worth doing
something about, I'll leave up to you.

> then why we have this common pattern of 'pinmux' (or pinctrl*)
> prioritized firstly in the natural sort order, also pinctrl-names before
> pinctrl-N is a common pattern that seems an arbitrary reversal of
> natural sort order?

Usually "foo" is followed by "foo-names", but pinctrl does appear to be
a bit different since everything has a -something suffix. Skimming, it
looks like there are actually more instances where pinctrl-names appears
before pinctrl-N.