| Message ID | 20230704190512.50127-1-eugen.hristev@collabora.com |
|---|---|
| State | Accepted |
| Commit | 7031224000a03e62ae4ae4f8228cbdd10339f5a7 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [v4,1/2] ARM: dts: rockchip: rk3588: Move bootph-all props to common file | expand |
On 2023/7/5 03:05, Eugen Hristev wrote: > Move bootph-all prop to common SoC dt file, because they are typically used > by multiple boards. > Unreferenced nodes are removed from the SPL device tree during a > normal build. > > Suggested-by: Jonas Karlman <jonas@kwiboo.se> > Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > Resent with correct mail addresses > > Changes in v4: > - new patch > > arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 54 ------------------------ > arch/arm/dts/rk3588s-u-boot.dtsi | 56 +++++++++++++++++++++++++ > 2 files changed, 56 insertions(+), 54 deletions(-) > > diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > index f453aeeaf526..2a80422390e7 100644 > --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi > @@ -77,26 +77,6 @@ > status = "okay"; > }; > > -&emmc_bus8 { > - bootph-all; > -}; > - > -&emmc_clk { > - bootph-all; > -}; > - > -&emmc_cmd { > - bootph-all; > -}; > - > -&emmc_data_strobe { > - bootph-all; > -}; > - > -&emmc_rstnout { > - bootph-all; > -}; > - > &fspim2_pins { > bootph-all; > }; > @@ -109,8 +89,6 @@ > }; > > &pinctrl { > - bootph-all; > - > pcie { > pcie_reset_h: pcie-reset-h { > rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; > @@ -139,39 +117,11 @@ > }; > }; > > -&pcfg_pull_none { > - bootph-all; > -}; > - > -&pcfg_pull_up_drv_level_2 { > - bootph-all; > -}; > - > -&pcfg_pull_up { > - bootph-all; > -}; > - > &sdmmc { > bus-width = <4>; > status = "okay"; > }; > > -&sdmmc_bus4 { > - bootph-all; > -}; > - > -&sdmmc_clk { > - bootph-all; > -}; > - > -&sdmmc_cmd { > - bootph-all; > -}; > - > -&sdmmc_det { > - bootph-all; > -}; > - > &sdhci { > cap-mmc-highspeed; > mmc-ddr-1_8v; > @@ -199,10 +149,6 @@ > }; > }; > > -&uart2m0_xfer { > - bootph-all; > -}; > - > &usb_host0_ehci { > companion = <&usb_host0_ohci>; > phys = <&u2phy2_host>; > diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi > index acb1cfe20063..2d0b0d8ce2fc 100644 > --- a/arch/arm/dts/rk3588s-u-boot.dtsi > +++ b/arch/arm/dts/rk3588s-u-boot.dtsi > @@ -302,6 +302,42 @@ > }; > }; > > +&emmc_bus8 { > + bootph-all; > +}; > + > +&emmc_clk { > + bootph-all; > +}; > + > +&emmc_cmd { > + bootph-all; > +}; > + > +&emmc_data_strobe { > + bootph-all; > +}; > + > +&emmc_rstnout { > + bootph-all; > +}; > + > +&pinctrl { > + bootph-all; > +}; > + > +&pcfg_pull_none { > + bootph-all; > +}; > + > +&pcfg_pull_up_drv_level_2 { > + bootph-all; > +}; > + > +&pcfg_pull_up { > + bootph-all; > +}; > + > &xin24m { > bootph-all; > status = "okay"; > @@ -335,12 +371,32 @@ > u-boot,spl-fifo-mode; > }; > > +&sdmmc_bus4 { > + bootph-all; > +}; > + > +&sdmmc_clk { > + bootph-all; > +}; > + > +&sdmmc_cmd { > + bootph-all; > +}; > + > +&sdmmc_det { > + bootph-all; > +}; > + > &uart2 { > clock-frequency = <24000000>; > bootph-pre-ram; > status = "okay"; > }; > > +&uart2m0_xfer { > + bootph-all; > +}; > + > &ioc { > bootph-pre-ram; > };
diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index f453aeeaf526..2a80422390e7 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -77,26 +77,6 @@ status = "okay"; }; -&emmc_bus8 { - bootph-all; -}; - -&emmc_clk { - bootph-all; -}; - -&emmc_cmd { - bootph-all; -}; - -&emmc_data_strobe { - bootph-all; -}; - -&emmc_rstnout { - bootph-all; -}; - &fspim2_pins { bootph-all; }; @@ -109,8 +89,6 @@ }; &pinctrl { - bootph-all; - pcie { pcie_reset_h: pcie-reset-h { rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; @@ -139,39 +117,11 @@ }; }; -&pcfg_pull_none { - bootph-all; -}; - -&pcfg_pull_up_drv_level_2 { - bootph-all; -}; - -&pcfg_pull_up { - bootph-all; -}; - &sdmmc { bus-width = <4>; status = "okay"; }; -&sdmmc_bus4 { - bootph-all; -}; - -&sdmmc_clk { - bootph-all; -}; - -&sdmmc_cmd { - bootph-all; -}; - -&sdmmc_det { - bootph-all; -}; - &sdhci { cap-mmc-highspeed; mmc-ddr-1_8v; @@ -199,10 +149,6 @@ }; }; -&uart2m0_xfer { - bootph-all; -}; - &usb_host0_ehci { companion = <&usb_host0_ohci>; phys = <&u2phy2_host>; diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index acb1cfe20063..2d0b0d8ce2fc 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -302,6 +302,42 @@ }; }; +&emmc_bus8 { + bootph-all; +}; + +&emmc_clk { + bootph-all; +}; + +&emmc_cmd { + bootph-all; +}; + +&emmc_data_strobe { + bootph-all; +}; + +&emmc_rstnout { + bootph-all; +}; + +&pinctrl { + bootph-all; +}; + +&pcfg_pull_none { + bootph-all; +}; + +&pcfg_pull_up_drv_level_2 { + bootph-all; +}; + +&pcfg_pull_up { + bootph-all; +}; + &xin24m { bootph-all; status = "okay"; @@ -335,12 +371,32 @@ u-boot,spl-fifo-mode; }; +&sdmmc_bus4 { + bootph-all; +}; + +&sdmmc_clk { + bootph-all; +}; + +&sdmmc_cmd { + bootph-all; +}; + +&sdmmc_det { + bootph-all; +}; + &uart2 { clock-frequency = <24000000>; bootph-pre-ram; status = "okay"; }; +&uart2m0_xfer { + bootph-all; +}; + &ioc { bootph-pre-ram; };
Move bootph-all prop to common SoC dt file, because they are typically used by multiple boards. Unreferenced nodes are removed from the SPL device tree during a normal build. Suggested-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> --- Resent with correct mail addresses Changes in v4: - new patch arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 54 ------------------------ arch/arm/dts/rk3588s-u-boot.dtsi | 56 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 54 deletions(-)