[PATCH v2 10/23] rockchip: rk35xx: Sort soc u-boot.dtsi alphabetically

[Jonas Karlman]

Hi Quentin,

On 2024-04-15 10:46, Quentin Schulz wrote:
> Hi Jonas,
> 
> On 4/13/24 20:13, Jonas Karlman wrote:
>> Sort nodes and props in RK356x/RK3588 u-boot.dtsi alphabetically, nodes
>> is sorted by reg addr then by alphabetical order.
>>
>> This has no intended change beside sorting existing nodes and removing
>> a duplicated usbdpphy0_grf node.
>>
>> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
>> ---
>> v2: Follow kernel sort order (Quentin)
>>
>> [1] https://www.kernel.org/doc/html/latest/devicetree/bindings/dts-coding-style.html#order-of-properties-in-device-node
>> ---
>>   arch/arm/dts/rk356x-u-boot.dtsi  | 98 ++++++++++++++++----------------
>>   arch/arm/dts/rk3588s-u-boot.dtsi | 69 +++++++++++-----------
>>   2 files changed, 81 insertions(+), 86 deletions(-)
>>
>> diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
>> index 05367216e118..1ecf719202e9 100644
>> --- a/arch/arm/dts/rk356x-u-boot.dtsi
>> +++ b/arch/arm/dts/rk356x-u-boot.dtsi
>> @@ -38,46 +38,10 @@
> 
> [...]
> 
>>   #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
>>   &binman {
>>   	simple-bin-spi {
> 
> We could also alphabetically sort the binman node if we wanted.
> 
>> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
>> index 233eb79d9ba2..543327954b1a 100644
>> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
>> @@ -41,6 +41,17 @@
>>   		status = "disabled";
>>   	};
>>   
>> +	vo0_grf: syscon at fd5a6000 {
>> +		compatible = "rockchip,rk3588-vo-grf", "syscon";
>> +		reg = <0x0 0xfd5a6000 0x0 0x2000>;
>> +		clocks = <&cru PCLK_VO0GRF>;
>> +	};
>> +
>> +	usb_grf: syscon at fd5ac000 {
>> +		compatible = "rockchip,rk3588-usb-grf", "syscon";
>> +		reg = <0x0 0xfd5ac000 0x0 0x4000>;
>> +	};
>> +
>>   	usbdpphy0_grf: syscon at fd5c8000 {
>>   		compatible = "rockchip,rk3588-usbdpphy-grf", "syscon";
>>   		reg = <0x0 0xfd5c8000 0x0 0x4000>;
>> @@ -72,22 +83,6 @@
>>   		};
>>   	};
>>   
>> -	vo0_grf: syscon at fd5a6000 {
>> -		compatible = "rockchip,rk3588-vo-grf", "syscon";
>> -		reg = <0x0 0xfd5a6000 0x0 0x2000>;
>> -		clocks = <&cru PCLK_VO0GRF>;
>> -	};
>> -
>> -	usb_grf: syscon at fd5ac000 {
>> -		compatible = "rockchip,rk3588-usb-grf", "syscon";
>> -		reg = <0x0 0xfd5ac000 0x0 0x4000>;
>> -	};
>> -
>> -	usbdpphy0_grf: syscon at fd5c8000 {
>> -		compatible = "rockchip,rk3588-usbdpphy-grf", "syscon";
>> -		reg = <0x0 0xfd5c8000 0x0 0x4000>;
>> -	};
>> -
> 
> Would have been nice to at least mention this node is removed because it 
> is duplicated (or have it removed in a different commit to make it more 
> explicit).

I did mention the removal in the commit message :-)

"This has no intended change beside sorting existing nodes and removing
a duplicated usbdpphy0_grf node."

> 
> [...]
> 
>>   #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
> 
> What's below this git context is &binman, which we could also 
> alphabetically sort if we wanted.

Was unsure about the binman node, ideally we should not be need it in
the <soc>-u-boot.dtsi file, so I decided not to touch it at all, will
move it in v3.

Regards,
Jonas

> 
> Did the change manually and it matches, so:
> 
> Reviewed-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
> 
> Thanks!
> Quentin