dts: rk3288: remove node in dmc which not need anymore

Since we implement the dram capacity auto detect, we don't
need to set the channel number and sdram-channel in dts.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Tested-by: Vagrant Cascadian <vagrant@debian.org>

diff --git a/arch/arm/dts/rk3288-evb.dts b/arch/arm/dts/rk3288-evb.dts
index 3e1ee58a5ee1279ae7241fb25e095db023862616..3f03e1326cb369002771ef472201c53a1f9e0dad 100644 (file)
--- a/arch/arm/dts/rk3288-evb.dts
+++ b/arch/arm/dts/rk3288-evb.dts
@@ -17,7 +17,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        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
@@ -25,8 +24,6 @@
                0x8 0x1f4>;
        rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
                0x0 0xc3 0x6 0x2>;
-       /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-channel = /bits/ 8 <0x2 0xa 0x3 0x2 0x2 0x0 0xe 0xe 0xff>;
        rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
 };
 

diff --git a/arch/arm/dts/rk3288-fennec.dts b/arch/arm/dts/rk3288-fennec.dts
index 36e9f3dac5644a35b4823da667355161c8ddc378..66ddf8d655bed9132584957c75cfb1a16ea9dcc5 100644 (file)
--- a/arch/arm/dts/rk3288-fennec.dts
+++ b/arch/arm/dts/rk3288-fennec.dts
@@ -17,7 +17,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        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
@@ -25,8 +24,6 @@
                0x8 0x1f4>;
        rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
                0x0 0xc3 0x6 0x2>;
-       /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-channel = /bits/ 8 <0x2 0xa 0x3 0x2 0x2 0x0 0xe 0xe 0xff>;
        rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
 };
 

diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts
index 3176d5046b2a4a622bb700b2ab189575204ec2c0..97568a36ee2fe627520e0126a5c9bb776a4cf03e 100644 (file)
--- a/arch/arm/dts/rk3288-firefly.dts
+++ b/arch/arm/dts/rk3288-firefly.dts
@@ -22,7 +22,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -31,7 +30,6 @@
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
        /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>;
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 

diff --git a/arch/arm/dts/rk3288-miniarm.dts b/arch/arm/dts/rk3288-miniarm.dts
index c7410821d366170949640b452f9b12727e8d2391..9083028579f1068a8ca7fd7c609448332126209f 100644 (file)
--- a/arch/arm/dts/rk3288-miniarm.dts
+++ b/arch/arm/dts/rk3288-miniarm.dts
@@ -17,7 +17,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -25,8 +24,6 @@
                0x5 0x0>;
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
-       /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>;
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 

diff --git a/arch/arm/dts/rk3288-popmetal.dts b/arch/arm/dts/rk3288-popmetal.dts
index 3f61a61f97cd5d0ac356f315ed4a630cd4c722ee..284d5eda7bc6a24f96b69f608b0ba299af43c36c 100644 (file)
--- a/arch/arm/dts/rk3288-popmetal.dts
+++ b/arch/arm/dts/rk3288-popmetal.dts
@@ -17,7 +17,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -25,8 +24,6 @@
                0x5 0x0>;
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
-       /* Add a dummy value to cause of-platdata think this is bytes */
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>;
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 

diff --git a/arch/arm/dts/rk3288-rock2-square.dts b/arch/arm/dts/rk3288-rock2-square.dts
index 2c30355f06bf285eb5a9169fb41d49b83519a721..11c580a0b56a34f9f19ded998d542fd671b22241 100644 (file)
--- a/arch/arm/dts/rk3288-rock2-square.dts
+++ b/arch/arm/dts/rk3288-rock2-square.dts
@@ -184,7 +184,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -192,7 +191,6 @@
                0x5 0x0>;
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>;
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 

diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index d9d51879f03b09ae9505523ff7517f4217773019..2ffe39cbf710331a699232249fbb2a860a071077 100644 (file)
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -245,7 +245,6 @@
                533000 1150000
                666000 1200000
        >;
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -253,7 +252,6 @@
                0x5 0x0>;
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>;
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };