| Message ID | 20241105160054.1373319-3-jonas@kwiboo.se |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: rk3288-tinker: Migrate to OF_UPSTREAM | expand |
On 2024/11/6 00:00, Jonas Karlman wrote: > Sort the nodes in rk3288-tinker u-boot.dtsi files in alphabetical order. > > This has no intended change to board DTs and only rearrange nodes in > preparation for future changes. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 8 ++--- > arch/arm/dts/rk3288-tinker-u-boot.dtsi | 44 ++++++++++++------------ > 2 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi > index b4c5483146ab..a782f2f9804a 100644 > --- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi > +++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi > @@ -17,18 +17,18 @@ > bootph-pre-ram; > }; > > -&emmc_clk { > +&emmc_bus8 { > bootph-pre-ram; > }; > > -&emmc_cmd { > +&emmc_clk { > bootph-pre-ram; > }; > > -&emmc_pwr { > +&emmc_cmd { > bootph-pre-ram; > }; > > -&emmc_bus8 { > +&emmc_pwr { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > index 0cf1b696d168..032dac221c24 100644 > --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi > +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > @@ -17,6 +17,10 @@ > rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; > }; > > +&gpio7 { > + bootph-pre-ram; > +}; > + > &i2c2 { > m24c08@50 { > compatible = "at,24c08", "i2c-eeprom"; > @@ -24,31 +28,15 @@ > }; > }; > > -&pinctrl { > - bootph-all; > -}; > - > -&uart2 { > - bootph-all; > -}; > - > -&uart2_xfer { > - bootph-all; > -}; > - > -&sdmmc { > - bootph-pre-ram; > -}; > - > -&gpio7 { > +&pcfg_pull_none { > bootph-pre-ram; > }; > > -&vcc_sd { > +&pcfg_pull_none_drv_8ma { > bootph-pre-ram; > }; > > -&pcfg_pull_none_drv_8ma { > +&pcfg_pull_up { > bootph-pre-ram; > }; > > @@ -56,11 +44,11 @@ > bootph-pre-ram; > }; > > -&pcfg_pull_none { > - bootph-pre-ram; > +&pinctrl { > + bootph-all; > }; > > -&pcfg_pull_up { > +&sdmmc { > bootph-pre-ram; > }; > > @@ -83,3 +71,15 @@ > &sdmmc_pwr { > bootph-pre-ram; > }; > + > +&uart2 { > + bootph-all; > +}; > + > +&uart2_xfer { > + bootph-all; > +}; > + > +&vcc_sd { > + bootph-pre-ram; > +};
diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi index b4c5483146ab..a782f2f9804a 100644 --- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi @@ -17,18 +17,18 @@ bootph-pre-ram; }; -&emmc_clk { +&emmc_bus8 { bootph-pre-ram; }; -&emmc_cmd { +&emmc_clk { bootph-pre-ram; }; -&emmc_pwr { +&emmc_cmd { bootph-pre-ram; }; -&emmc_bus8 { +&emmc_pwr { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 0cf1b696d168..032dac221c24 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -17,6 +17,10 @@ rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; }; +&gpio7 { + bootph-pre-ram; +}; + &i2c2 { m24c08@50 { compatible = "at,24c08", "i2c-eeprom"; @@ -24,31 +28,15 @@ }; }; -&pinctrl { - bootph-all; -}; - -&uart2 { - bootph-all; -}; - -&uart2_xfer { - bootph-all; -}; - -&sdmmc { - bootph-pre-ram; -}; - -&gpio7 { +&pcfg_pull_none { bootph-pre-ram; }; -&vcc_sd { +&pcfg_pull_none_drv_8ma { bootph-pre-ram; }; -&pcfg_pull_none_drv_8ma { +&pcfg_pull_up { bootph-pre-ram; }; @@ -56,11 +44,11 @@ bootph-pre-ram; }; -&pcfg_pull_none { - bootph-pre-ram; +&pinctrl { + bootph-all; }; -&pcfg_pull_up { +&sdmmc { bootph-pre-ram; }; @@ -83,3 +71,15 @@ &sdmmc_pwr { bootph-pre-ram; }; + +&uart2 { + bootph-all; +}; + +&uart2_xfer { + bootph-all; +}; + +&vcc_sd { + bootph-pre-ram; +};
Sort the nodes in rk3288-tinker u-boot.dtsi files in alphabetical order. This has no intended change to board DTs and only rearrange nodes in preparation for future changes. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 8 ++--- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 44 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-)