| Message ID | 20240126221508.4093334-8-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | e927782527c31f1a1f9985af7b457371c4ef6db4 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk35xx: Sync device tree with linux v6.8-rc1 | expand |
On 2024/1/27 06:14, Jonas Karlman wrote: > Remove unnecessary status props from rk35xx u-boot.dtsi files, regular > device tree files or default value already enable the affected nodes. > > Also reorder bootph-pre-ram and clock-frequency props alphabetically in > rk3588s-u-boot.dtsi uart2 node. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk356x-u-boot.dtsi | 7 ------- > arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 1 - > arch/arm/dts/rk3588s-u-boot.dtsi | 7 +------ > 3 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi > index cacd45348a49..d347080577d9 100644 > --- a/arch/arm/dts/rk356x-u-boot.dtsi > +++ b/arch/arm/dts/rk356x-u-boot.dtsi > @@ -19,7 +19,6 @@ > dmc: dmc { > compatible = "rockchip,rk3568-dmc"; > bootph-all; > - status = "okay"; > }; > > otp: nvmem@fe38c000 { > @@ -27,7 +26,6 @@ > reg = <0x0 0xfe38c000 0x0 0x4000>; > #address-cells = <1>; > #size-cells = <1>; > - status = "okay"; > > cpu_id: id@a { > reg = <0x0a 0x10>; > @@ -37,27 +35,22 @@ > > &xin24m { > bootph-all; > - status = "okay"; > }; > > &cru { > bootph-all; > - status = "okay"; > }; > > &pmucru { > bootph-all; > - status = "okay"; > }; > > &grf { > bootph-all; > - status = "okay"; > }; > > &pmugrf { > bootph-all; > - status = "okay"; > }; > > &pinctrl { > diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi > index e791b572b6bf..471508a9ed74 100644 > --- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi > +++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi > @@ -15,5 +15,4 @@ > &uart9 { > bootph-pre-ram; > clock-frequency = <24000000>; > - status = "okay"; > }; > diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi > index 945b2d62a75e..bf3b1ea8a3c6 100644 > --- a/arch/arm/dts/rk3588s-u-boot.dtsi > +++ b/arch/arm/dts/rk3588s-u-boot.dtsi > @@ -17,7 +17,6 @@ > dmc { > compatible = "rockchip,rk3588-dmc"; > bootph-all; > - status = "okay"; > }; > > usb_host0_xhci: usb@fc000000 { > @@ -165,17 +164,14 @@ > > &xin24m { > bootph-all; > - status = "okay"; > }; > > &cru { > bootph-pre-ram; > - status = "okay"; > }; > > &sys_grf { > bootph-pre-ram; > - status = "okay"; > }; > > &pmu1grf { > @@ -217,9 +213,8 @@ > }; > > &uart2 { > - clock-frequency = <24000000>; > bootph-pre-ram; > - status = "okay"; > + clock-frequency = <24000000>; > }; > > &uart2m0_xfer {
diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index cacd45348a49..d347080577d9 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -19,7 +19,6 @@ dmc: dmc { compatible = "rockchip,rk3568-dmc"; bootph-all; - status = "okay"; }; otp: nvmem@fe38c000 { @@ -27,7 +26,6 @@ reg = <0x0 0xfe38c000 0x0 0x4000>; #address-cells = <1>; #size-cells = <1>; - status = "okay"; cpu_id: id@a { reg = <0x0a 0x10>; @@ -37,27 +35,22 @@ &xin24m { bootph-all; - status = "okay"; }; &cru { bootph-all; - status = "okay"; }; &pmucru { bootph-all; - status = "okay"; }; &grf { bootph-all; - status = "okay"; }; &pmugrf { bootph-all; - status = "okay"; }; &pinctrl { diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi index e791b572b6bf..471508a9ed74 100644 --- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi +++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi @@ -15,5 +15,4 @@ &uart9 { bootph-pre-ram; clock-frequency = <24000000>; - status = "okay"; }; diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index 945b2d62a75e..bf3b1ea8a3c6 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -17,7 +17,6 @@ dmc { compatible = "rockchip,rk3588-dmc"; bootph-all; - status = "okay"; }; usb_host0_xhci: usb@fc000000 { @@ -165,17 +164,14 @@ &xin24m { bootph-all; - status = "okay"; }; &cru { bootph-pre-ram; - status = "okay"; }; &sys_grf { bootph-pre-ram; - status = "okay"; }; &pmu1grf { @@ -217,9 +213,8 @@ }; &uart2 { - clock-frequency = <24000000>; bootph-pre-ram; - status = "okay"; + clock-frequency = <24000000>; }; &uart2m0_xfer {
Remove unnecessary status props from rk35xx u-boot.dtsi files, regular device tree files or default value already enable the affected nodes. Also reorder bootph-pre-ram and clock-frequency props alphabetically in rk3588s-u-boot.dtsi uart2 node. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk356x-u-boot.dtsi | 7 ------- arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 1 - arch/arm/dts/rk3588s-u-boot.dtsi | 7 +------ 3 files changed, 1 insertion(+), 14 deletions(-)