The SDHCI controller nodes in platforms which are based on Samsung's Exynos4210 SoC are using the older custom Samsung SDHCI bindings. Remove the old Samsung specific bindings and use the generic mmc bindings that are defined for mmc controllers.
Cc: Kukjin Kim <[email protected]> Cc: Chris Ball <[email protected]> Signed-off-by: Thomas Abraham <[email protected]> --- arch/arm/boot/dts/exynos4210-origen.dts | 10 ++++------ arch/arm/boot/dts/exynos4210-smdkv310.dts | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 0c49caa..5b5f389 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -30,10 +30,9 @@ }; sdhci@12530000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk2 2 2 3 3>; + cd-gpios = <&gpk2 2 2 3 3>; gpios = <&gpk2 0 2 0 3>, <&gpk2 1 2 0 3>, <&gpk2 3 2 3 3>, @@ -43,10 +42,9 @@ }; sdhci@12510000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk0 2 2 3 3>; + cd-gpios = <&gpk0 2 2 3 3>; gpios = <&gpk0 0 2 0 3>, <&gpk0 1 2 0 3>, <&gpk0 3 2 3 3>, diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 1beccc8..f090095 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -30,10 +30,9 @@ }; sdhci@12530000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk2 2 2 3 3>; + cd-gpios = <&gpk2 2 2 3 3>; gpios = <&gpk2 0 2 0 3>, <&gpk2 1 2 0 3>, <&gpk2 3 2 3 3>, -- 1.6.6.rc2 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
