| From 7e9e20b1faab02357501553d7f4e3efec1b4cfd3 Mon Sep 17 00:00:00 2001 |
| From: Andreas Faerber <afaerber@suse.de> |
| Date: Wed, 18 Mar 2015 01:25:18 +0900 |
| Subject: ARM: dts: fix mmc node updates for exynos5250-spring |
| |
| From: Andreas Faerber <afaerber@suse.de> |
| |
| commit 7e9e20b1faab02357501553d7f4e3efec1b4cfd3 upstream. |
| |
| Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: |
| unuse the slot-node and deprecate the supports-highspeed for dw-mmc in |
| exynos") by dropping the slot@0 nodes, moving its bus-width property to |
| the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, |
| matching exynos5250-snow. |
| |
| Cc: Jaehoon Chung <jh80.chung@samsung.com> |
| Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") |
| Signed-off-by: Andreas Faerber <afaerber@suse.de> |
| Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> |
| Signed-off-by: Kukjin Kim <kgene@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ |
| 1 file changed, 4 insertions(+), 12 deletions(-) |
| |
| --- a/arch/arm/boot/dts/exynos5250-spring.dts |
| +++ b/arch/arm/boot/dts/exynos5250-spring.dts |
| @@ -429,7 +429,6 @@ |
| &mmc_0 { |
| status = "okay"; |
| num-slots = <1>; |
| - supports-highspeed; |
| broken-cd; |
| card-detect-delay = <200>; |
| samsung,dw-mshc-ciu-div = <3>; |
| @@ -437,11 +436,8 @@ |
| samsung,dw-mshc-ddr-timing = <1 2>; |
| pinctrl-names = "default"; |
| pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; |
| - |
| - slot@0 { |
| - reg = <0>; |
| - bus-width = <8>; |
| - }; |
| + bus-width = <8>; |
| + cap-mmc-highspeed; |
| }; |
| |
| /* |
| @@ -451,7 +447,6 @@ |
| &mmc_1 { |
| status = "okay"; |
| num-slots = <1>; |
| - supports-highspeed; |
| broken-cd; |
| card-detect-delay = <200>; |
| samsung,dw-mshc-ciu-div = <3>; |
| @@ -459,11 +454,8 @@ |
| samsung,dw-mshc-ddr-timing = <1 2>; |
| pinctrl-names = "default"; |
| pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>; |
| - |
| - slot@0 { |
| - reg = <0>; |
| - bus-width = <4>; |
| - }; |
| + bus-width = <4>; |
| + cap-sd-highspeed; |
| }; |
| |
| &pinctrl_0 { |