rockchip: dts: tinker: Move u-boot dmc initialization to specific section

dmc is used to initialize the memory controller. It's needed by
u-boot. Move it in the specific section

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
index f7f9d6dc721aae3c5f67c4ef54ad2edaa2ff3c40..732aa4f91fc7aab52613b0af3e2e79bce7579967 100644 (file)
--- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
@@ -5,6 +5,18 @@
 
 #include "rk3288-u-boot.dtsi"
 
+&dmc {
+       u-boot,dm-pre-reloc;
+       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+               0x8 0x1f4>;
+       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+               0x0 0xc3 0x6 0x2>;
+       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
+};
+
 &pinctrl {
        u-boot,dm-pre-reloc;
 };

diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
index 94c3afe8604ef532b266ec1e59f27d66c11703b2..4b8405fd82445ffc22d7af4abe1be711d15f14b2 100644 (file)
--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
@@ -15,18 +15,6 @@
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-               0x8 0x1f4>;
-       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-               0x0 0xc3 0x6 0x2>;
-       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
-};
-
-
 &pinctrl {
        usb {
                host_vbus_drv: host-vbus-drv {