| Message ID | 20240413181425.1384357-11-jonas@kwiboo.se |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk35xx: Miscellaneous fixes and updates | expand |
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@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@fd5a6000 { > + compatible = "rockchip,rk3588-vo-grf", "syscon"; > + reg = <0x0 0xfd5a6000 0x0 0x2000>; > + clocks = <&cru PCLK_VO0GRF>; > + }; > + > + usb_grf: syscon@fd5ac000 { > + compatible = "rockchip,rk3588-usb-grf", "syscon"; > + reg = <0x0 0xfd5ac000 0x0 0x4000>; > + }; > + > usbdpphy0_grf: syscon@fd5c8000 { > compatible = "rockchip,rk3588-usbdpphy-grf", "syscon"; > reg = <0x0 0xfd5c8000 0x0 0x4000>; > @@ -72,22 +83,6 @@ > }; > }; > > - vo0_grf: syscon@fd5a6000 { > - compatible = "rockchip,rk3588-vo-grf", "syscon"; > - reg = <0x0 0xfd5a6000 0x0 0x2000>; > - clocks = <&cru PCLK_VO0GRF>; > - }; > - > - usb_grf: syscon@fd5ac000 { > - compatible = "rockchip,rk3588-usb-grf", "syscon"; > - reg = <0x0 0xfd5ac000 0x0 0x4000>; > - }; > - > - usbdpphy0_grf: syscon@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). [...] > #ifdef CONFIG_ROCKCHIP_SPI_IMAGE What's below this git context is &binman, which we could also alphabetically sort if we wanted. Did the change manually and it matches, so: Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Thanks! Quentin
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@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@fd5a6000 { >> + compatible = "rockchip,rk3588-vo-grf", "syscon"; >> + reg = <0x0 0xfd5a6000 0x0 0x2000>; >> + clocks = <&cru PCLK_VO0GRF>; >> + }; >> + >> + usb_grf: syscon@fd5ac000 { >> + compatible = "rockchip,rk3588-usb-grf", "syscon"; >> + reg = <0x0 0xfd5ac000 0x0 0x4000>; >> + }; >> + >> usbdpphy0_grf: syscon@fd5c8000 { >> compatible = "rockchip,rk3588-usbdpphy-grf", "syscon"; >> reg = <0x0 0xfd5c8000 0x0 0x4000>; >> @@ -72,22 +83,6 @@ >> }; >> }; >> >> - vo0_grf: syscon@fd5a6000 { >> - compatible = "rockchip,rk3588-vo-grf", "syscon"; >> - reg = <0x0 0xfd5a6000 0x0 0x2000>; >> - clocks = <&cru PCLK_VO0GRF>; >> - }; >> - >> - usb_grf: syscon@fd5ac000 { >> - compatible = "rockchip,rk3588-usb-grf", "syscon"; >> - reg = <0x0 0xfd5ac000 0x0 0x4000>; >> - }; >> - >> - usbdpphy0_grf: syscon@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@theobroma-systems.com> > > Thanks! > Quentin
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 @@ }; }; -&xin24m { - bootph-all; -}; - &cru { bootph-all; }; -&pmucru { - bootph-all; -}; - -&grf { - bootph-all; -}; - -&pmugrf { - bootph-all; -}; - -&pinctrl { - bootph-all; -}; - -&pcfg_pull_none_smt { - bootph-all; -}; - -&pcfg_pull_none { - bootph-all; -}; - -&pcfg_pull_up_drv_level_2 { - bootph-all; -}; - -&pcfg_pull_up { - bootph-all; -}; - &emmc_bus8 { bootph-all; }; @@ -102,10 +66,51 @@ bootph-all; }; +&grf { + bootph-all; +}; + &i2c0_xfer { bootph-all; }; +&pcfg_pull_none { + bootph-all; +}; + +&pcfg_pull_none_smt { + bootph-all; +}; + +&pcfg_pull_up { + bootph-all; +}; + +&pcfg_pull_up_drv_level_2 { + bootph-all; +}; + +&pinctrl { + bootph-all; +}; + +&pmucru { + bootph-all; +}; + +&pmugrf { + bootph-all; +}; + +&sdhci { + bootph-pre-ram; + max-frequency = <200000000>; +}; + +&sdmmc0 { + bootph-pre-ram; +}; + &sdmmc0_bus4 { bootph-all; }; @@ -126,24 +131,19 @@ bootph-all; }; -&uart2m0_xfer { - bootph-all; -}; - -&sdhci { - bootph-pre-ram; - max-frequency = <200000000>; -}; - -&sdmmc0 { - bootph-pre-ram; -}; - &uart2 { bootph-pre-ram; clock-frequency = <24000000>; }; +&uart2m0_xfer { + bootph-all; +}; + +&xin24m { + bootph-all; +}; + #ifdef CONFIG_ROCKCHIP_SPI_IMAGE &binman { simple-bin-spi { 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@fd5a6000 { + compatible = "rockchip,rk3588-vo-grf", "syscon"; + reg = <0x0 0xfd5a6000 0x0 0x2000>; + clocks = <&cru PCLK_VO0GRF>; + }; + + usb_grf: syscon@fd5ac000 { + compatible = "rockchip,rk3588-usb-grf", "syscon"; + reg = <0x0 0xfd5ac000 0x0 0x4000>; + }; + usbdpphy0_grf: syscon@fd5c8000 { compatible = "rockchip,rk3588-usbdpphy-grf", "syscon"; reg = <0x0 0xfd5c8000 0x0 0x4000>; @@ -72,22 +83,6 @@ }; }; - vo0_grf: syscon@fd5a6000 { - compatible = "rockchip,rk3588-vo-grf", "syscon"; - reg = <0x0 0xfd5a6000 0x0 0x2000>; - clocks = <&cru PCLK_VO0GRF>; - }; - - usb_grf: syscon@fd5ac000 { - compatible = "rockchip,rk3588-usb-grf", "syscon"; - reg = <0x0 0xfd5ac000 0x0 0x4000>; - }; - - usbdpphy0_grf: syscon@fd5c8000 { - compatible = "rockchip,rk3588-usbdpphy-grf", "syscon"; - reg = <0x0 0xfd5c8000 0x0 0x4000>; - }; - rng: rng@fe378000 { compatible = "rockchip,trngv1"; reg = <0x0 0xfe378000 0x0 0x200>; @@ -125,6 +120,10 @@ }; }; +&cru { + bootph-pre-ram; +}; + &emmc_bus8 { bootph-all; }; @@ -145,32 +144,24 @@ bootph-all; }; -&pinctrl { - bootph-all; +&ioc { + bootph-pre-ram; }; &pcfg_pull_none { bootph-all; }; -&pcfg_pull_up_drv_level_2 { - bootph-all; -}; - &pcfg_pull_up { bootph-all; }; -&xin24m { +&pcfg_pull_up_drv_level_2 { bootph-all; }; -&cru { - bootph-pre-ram; -}; - -&sys_grf { - bootph-pre-ram; +&pinctrl { + bootph-all; }; &pmu1grf { @@ -185,18 +176,18 @@ bootph-pre-ram; }; -&sdmmc { - bootph-pre-ram; - bootph-some-ram; - u-boot,spl-fifo-mode; -}; - &sdhci { bootph-pre-ram; bootph-some-ram; u-boot,spl-fifo-mode; }; +&sdmmc { + bootph-pre-ram; + bootph-some-ram; + u-boot,spl-fifo-mode; +}; + &sdmmc_bus4 { bootph-all; }; @@ -213,6 +204,10 @@ bootph-all; }; +&sys_grf { + bootph-pre-ram; +}; + &uart2 { bootph-pre-ram; clock-frequency = <24000000>; @@ -222,8 +217,8 @@ bootph-all; }; -&ioc { - bootph-pre-ram; +&xin24m { + bootph-all; }; #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
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@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(-)