Hi Kever, On Mon, Nov 15, 2021 at 11:08 PM Jagan Teki <ja...@amarulasolutions.com> wrote: > > dmc node is specific to U-Boot, it is always better practice > to maintain U-Boot specific nodes into -u-boot.dtsi files > in order to maintain Linux dts file sync compatibility. > > Move the dmc into px30-u-boot.dtsi, also add dmc node > explicitly in rk3326-odroid-go2-u-boot.dtsi since it is > using px30.dts. > > Signed-off-by: Jagan Teki <ja...@amarulasolutions.com> > --- > Changes for v2: > - none > > arch/arm/dts/px30-u-boot.dtsi | 10 ++++++---- > arch/arm/dts/px30.dtsi | 5 ----- > arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 ++++++---- > 3 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi > index 029c8fbd8d..bbed7dcde5 100644 > --- a/arch/arm/dts/px30-u-boot.dtsi > +++ b/arch/arm/dts/px30-u-boot.dtsi > @@ -13,6 +13,12 @@ > u-boot,spl-boot-order = &emmc, &sdmmc; > }; > > + dmc { > + u-boot,dm-pre-reloc; > + compatible = "rockchip,px30-dmc", "syscon"; > + reg = <0x0 0xff2a0000 0x0 0x1000>; > + }; > + > rng: rng@ff0b0000 { > compatible = "rockchip,cryptov2-rng"; > reg = <0x0 0xff0b0000 0x0 0x4000>; > @@ -20,10 +26,6 @@ > }; > }; > > -&dmc { > - u-boot,dm-pre-reloc; > -}; > - > &uart2 { > clock-frequency = <24000000>; > u-boot,dm-pre-reloc; > diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi > index ef706486dc..ef77b7b997 100644 > --- a/arch/arm/dts/px30.dtsi > +++ b/arch/arm/dts/px30.dtsi > @@ -151,11 +151,6 @@ > interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; > }; > > - dmc: dmc { > - compatible = "rockchip,px30-dmc", "syscon"; > - reg = <0x0 0xff2a0000 0x0 0x1000>; > - }; > - > display_subsystem: display-subsystem { > compatible = "rockchip,display-subsystem"; > ports = <&vopb_out>, <&vopl_out>; > diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi > b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi > index bffaa3edf3..63d87e16e1 100644 > --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi > +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi > @@ -16,6 +16,12 @@ > serial2 = &uart2; > spi0 = &sfc; > }; > + > + dmc { > + u-boot,dm-pre-reloc; > + compatible = "rockchip,px30-dmc", "syscon"; > + reg = <0x0 0xff2a0000 0x0 0x1000>; > + }; > }; > > /* U-Boot clk driver for px30 cannot set GPU_CLK */ > @@ -32,10 +38,6 @@ > <100000000>, <17000000>; > }; > > -&dmc { > - u-boot,dm-pre-reloc; > -}; > - > &gpio0 { > u-boot,dm-pre-reloc; > }; > -- > 2.25.1 >
Any chance to apply these?