rockchip: dts: rk3328: update dmc node for driver

Update dmc node for full feature driver.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
[cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/1e1495636574c78ea9d3af3e0aae95d5204612d6 with minor modifications]
Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
index 22bfaef72a16f649bf0b5e7a30df99e2b474d7f2..58ebf52b4bf5e3aa43a596339e867fe9db421af5 100644 (file)
--- a/arch/arm/dts/rk3328-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi
@@ -3,6 +3,8 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
+#include "rk3328-sdram-ddr3-666.dtsi"
+
 / {
        aliases {
                mmc0 = &emmc;

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 928911f6a6f5b385640088f7962e52218979ea95..dbcce6ac64f01d07b4b336a7a794c104c595fe35 100644 (file)
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier:     GPL-2.0+
  */
 
+#include "rk3328-sdram-lpddr3-1600.dtsi"
+
 / {
        aliases {
                mmc0 = &emmc;

diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
new file mode 100644 (file)
index 0000000..d99e7e0
--- /dev/null
+++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
@@ -0,0 +1,215 @@
+/*
+ * (C) Copyright 2017 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+&dmc {
+       rockchip,sdram-params = <
+               0x1
+               0xC
+               0x3
+               0x1
+               0x0
+               0x0
+               0x10
+               0x10
+               0
+
+               0x9028b189
+               0x00000000
+               0x00000021
+               0x00000482
+               0x00000015
+               0x00000222
+               0x000000ff
+
+               333
+               3
+               0
+
+               0x00000000
+               0x43041001
+               0x00000064
+               0x0028003b
+               0x000000d0
+               0x00020053
+               0x000000d4
+               0x00020000
+               0x000000d8
+               0x00000100
+               0x000000dc
+               0x03200000
+               0x000000e0
+               0x00000000
+               0x000000e4
+               0x00090000
+               0x000000f4
+               0x000f011f
+               0x00000100
+               0x07090b06
+               0x00000104
+               0x00050209
+               0x00000108
+               0x03030407
+               0x0000010c
+               0x00202006
+               0x00000110
+               0x03020204
+               0x00000114
+               0x03030202
+               0x00000120
+               0x00000903
+               0x00000180
+               0x00800020
+               0x00000184
+               0x00000000
+               0x00000190
+               0x07010001
+               0x00000198
+               0x05001100
+               0x000001a0
+               0xc0400003
+               0x00000240
+               0x06000604
+               0x00000244
+               0x00000201
+               0x00000250
+               0x00000f00
+               0x00000490
+               0x00000001
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+
+               0x00000004
+               0x0000000a
+               0x00000028
+               0x00000006
+               0x0000002c
+               0x00000000
+               0x00000030
+               0x00000005
+               0xffffffff
+               0xffffffff
+
+               0x77
+               0x88
+               0x79
+               0x79
+               0x87
+               0x97
+               0x87
+               0x78
+               0x77
+               0x78
+               0x87
+               0x88
+               0x87
+               0x87
+               0x77
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+       >;
+};

diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
new file mode 100644 (file)
index 0000000..cc0011c
--- /dev/null
+++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
@@ -0,0 +1,215 @@
+/*
+ * (C) 2017 Theobroma Systems Design und Consulting GmbH
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+&dmc {
+       rockchip,sdram-params = <
+               0x1
+               0xC
+               0x3
+               0x1
+               0x0
+               0x0
+               0x10
+               0x10
+               0
+
+               0x98899459
+               0x00000000
+               0x0000002e
+               0x00000544
+               0x00000015
+               0x00000432
+               0x000000ff
+
+               800
+               6
+               1
+
+               0x00000000
+               0x43041008
+               0x00000064
+               0x00300054
+               0x000000d0
+               0x00500002
+               0x000000d4
+               0x00010000
+               0x000000d8
+               0x00000e03
+               0x000000dc
+               0x0043001a
+               0x000000e0
+               0x00010000
+               0x000000e4
+               0x000e0005
+               0x000000f4
+               0x000f011f
+               0x00000100
+               0x0b141b11
+               0x00000104
+               0x0003031a
+               0x00000108
+               0x03060809
+               0x0000010c
+               0x00606000
+               0x00000110
+               0x08020409
+               0x00000114
+               0x01010606
+               0x00000118
+               0x02020004
+               0x00000120
+               0x00000404
+               0x00000138
+               0x00000058
+               0x00000180
+               0x00900024
+               0x00000184
+               0x01400000
+               0x00000190
+               0x07050002
+               0x00000198
+               0x05001100
+               0x000001a0
+               0xc0400003
+               0x00000240
+               0x0a020b28
+               0x00000244
+               0x00000101
+               0x00000250
+               0x00000f00
+               0x00000490
+               0x00000001
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+
+               0x00000004
+               0x0000000b
+               0x00000028
+               0x0000000c
+               0x0000002c
+               0x00000000
+               0x00000030
+               0x00000006
+               0xffffffff
+               0xffffffff
+
+               0x77
+               0x88
+               0x79
+               0x79
+               0x87
+               0x97
+               0x87
+               0x78
+               0x77
+               0x78
+               0x87
+               0x88
+               0x87
+               0x87
+               0x77
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+       >;
+};

diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
new file mode 100644 (file)
index 0000000..62d809e
--- /dev/null
+++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
@@ -0,0 +1,215 @@
+/*
+ * (C) Copyright 2017 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+&dmc {
+       rockchip,sdram-params = <
+               0x1
+               0xC
+               0x3
+               0x1
+               0x0
+               0x0
+               0x10
+               0x10
+               0
+
+               0x0c48a18a
+               0x00000000
+               0x00000021
+               0x00000482
+               0x00000015
+               0x0000021a
+               0x000000ff
+
+               333
+               6
+               0
+
+               0x00000000
+               0xc3040008
+               0x00000064
+               0x00140023
+               0x000000d0
+               0x00220002
+               0x000000d4
+               0x00010000
+               0x000000d8
+               0x00000703
+               0x000000dc
+               0x00830004
+               0x000000e0
+               0x00010000
+               0x000000e4
+               0x00070003
+               0x00000100
+               0x06090b07
+               0x00000104
+               0x0002020b
+               0x00000108
+               0x02030506
+               0x0000010c
+               0x00505000
+               0x00000110
+               0x03020204
+               0x00000114
+               0x01010303
+               0x00000118
+               0x02020003
+               0x00000120
+               0x00000303
+               0x00000138
+               0x00000025
+               0x00000180
+               0x003c000f
+               0x00000184
+               0x00900000
+               0x00000190
+               0x07020000
+               0x00000198
+               0x05001100
+               0x000001a0
+               0xc0400003
+               0x00000240
+               0x0900090c
+               0x00000244
+               0x00000101
+               0x00000250
+               0x00000f00
+               0x00000490
+               0x00000001
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+
+               0x00000004
+               0x0000000b
+               0x00000028
+               0x00000006
+               0x0000002c
+               0x00000000
+               0x00000030
+               0x00000003
+               0xffffffff
+               0xffffffff
+
+               0x77
+               0x88
+               0x79
+               0x79
+               0x87
+               0x97
+               0x87
+               0x78
+               0x77
+               0x78
+               0x87
+               0x88
+               0x87
+               0x87
+               0x77
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x78
+               0x77
+               0x79
+               0x9
+
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x78
+               0x69
+               0x9
+
+               0x77
+               0x78
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x77
+               0x79
+               0x9
+       >;
+};

diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
index 2d80addbb0a57584c1a96c6a611313dfffc05dc3..a080ae8d69742822a3260ff642bd747ab50a9788 100644 (file)
--- a/arch/arm/dts/rk3328.dtsi
+++ b/arch/arm/dts/rk3328.dtsi
@@ -351,10 +351,15 @@
                status = "disabled";
        };
 
-       dmc: dmc@ff400000 {
+       dmc: dmc {
                u-boot,dm-pre-reloc;
-               compatible = "rockchip,rk3328-dmc", "syscon";
-               reg = <0x0 0xff400000 0x0 0x1000>;
+               compatible = "rockchip,rk3328-dmc";
+               reg = <0x0 0xff400000 0x0 0x1000
+                      0x0 0xff780000 0x0 0x3000
+                      0x0 0xff100000 0x0 0x1000
+                      0x0 0xff440000 0x0 0x1000
+                      0x0 0xff720000 0x0 0x1000
+                      0x0 0xff798000 0x0 0x1000>;
        };
 
        cru: clock-controller@ff440000 {