[PATCHv8 4/5] ARM: dts: rockchip: unuse the slot-node and deprecated the supports-highspeed for dw-mmc

[Heiko Stübner]

Hi,

Am Mittwoch, 30. Juli 2014, 20:05:09 schrieb Jaehoon Chung:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced to "cap-sd/mmc-highspeed".
> 
> Signed-off-by: Jaehoon Chung <jh80.chung at samsung.com>
> Reviewed-by: Tushar Behera <trblinux at gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson at linaro.org>
> Reviewed-by: Heiko Stuebner <heiko at sntech.de>
> Acked-by: Seungwon Jeon <tgih.jun at samsung.com>

we might get a conflict, with recent Rockchip-specific devicetree changes [0].
So depending on when the core changes of this series land, this patch
might use a respin.


Heiko


[0] https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=rockchip/dt&id=fcbbf965254ff1693c26a5646e4e62adc3a6118d
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=rockchip/dt&id=b09e35a388ad23eb90497a352b8e5e5cb4b97bf2

> ---
>  arch/arm/boot/dts/rk3066a-bqcurie2.dts |   16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index afb3273..ecea889 100644
> --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> @@ -59,12 +59,8 @@
>  			pinctrl-names = "default";
>  			pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
>  			vmmc-supply = <&vcc_sd0>;
> -
> -			slot at 0 {
> -				reg = <0>;
> -				bus-width = <4>;
> -				disable-wp;
> -			};
> +			bus-width = <4>;
> +			disable-wp;
>  		};
> 
>  		dwmmc at 10218000 { /* wifi */
> @@ -74,12 +70,8 @@
> 
>  			pinctrl-names = "default";
>  			pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
> -
> -			slot at 0 {
> -				reg = <0>;
> -				bus-width = <4>;
> -				disable-wp;
> -			};
> +			bus-width = <4>;
> +			disable-wp;
>  		};
> 
>  		gpio-keys {