[U-Boot] [PATCH v2 3/3] dts: rk3288: remove node in dmc which not need anymore

[Vagrant Cascadian]

On 2016-09-19, Kever Yang wrote:
> 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 at rock-chips.com>

Tested on firefly-rk3288, 2GB and 4GB ram board variants, using u-boot
2016.11-rc1.

Tested-by: Vagrant Cascadian <vagrant at debian.org>

> ---
>
> Changes in v2: None
>
>  arch/arm/dts/rk3288-evb.dts          | 3 ---
>  arch/arm/dts/rk3288-fennec.dts       | 3 ---
>  arch/arm/dts/rk3288-firefly.dts      | 2 --
>  arch/arm/dts/rk3288-miniarm.dts      | 3 ---
>  arch/arm/dts/rk3288-popmetal.dts     | 3 ---
>  arch/arm/dts/rk3288-rock2-square.dts | 2 --
>  arch/arm/dts/rk3288-veyron.dtsi      | 2 --
>  7 files changed, 18 deletions(-)
>
> diff --git a/arch/arm/dts/rk3288-evb.dts b/arch/arm/dts/rk3288-evb.dts
> index 3e1ee58..3f03e13 100644
> --- 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 36e9f3d..66ddf8d 100644
> --- 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 3176d50..97568a3 100644
> --- 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 c741082..9083028 100644
> --- 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 3f61a61..284d5ed 100644
> --- 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 2c30355..11c580a 100644
> --- 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 d9d5187..2ffe39c 100644
> --- 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>;
>  };
>  
> -- 
> 1.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161005/39510e94/attachment.sig>