arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi

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 <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi
index 029c8fbd8d99b94487e9ccc952846a2ae491399c..bbed7dcde5cd76f5582c9c89ff20c33c99f14851 100644 (file)
--- 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 ef706486dc60217e07cde609a4bbdc91ed5686f3..ef77b7b99790eb7d17693fe1db5c8f6094b4baa1 100644 (file)
--- 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 ea3641800d6b01a4091078ee166247b92d8fc7f4..6de95bed49ae9fa44d3ee62c3d3a73093537534e 100644 (file)
--- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
+++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
@@ -17,6 +17,12 @@
                spi0 = &sfc;
        };
 
+       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>;
@@ -38,10 +44,6 @@
                <100000000>, <17000000>;
 };
 
-&dmc {
-       u-boot,dm-pre-reloc;
-};
-
 &gpio0 {
        u-boot,dm-pre-reloc;
 };