]>
Commit | Line | Data |
---|---|---|
1e617d6d GKH |
1 | From 7e9e20b1faab02357501553d7f4e3efec1b4cfd3 Mon Sep 17 00:00:00 2001 |
2 | From: Andreas Faerber <afaerber@suse.de> | |
3 | Date: Wed, 18 Mar 2015 01:25:18 +0900 | |
4 | Subject: ARM: dts: fix mmc node updates for exynos5250-spring | |
5 | ||
6 | From: Andreas Faerber <afaerber@suse.de> | |
7 | ||
8 | commit 7e9e20b1faab02357501553d7f4e3efec1b4cfd3 upstream. | |
9 | ||
10 | Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: | |
11 | unuse the slot-node and deprecate the supports-highspeed for dw-mmc in | |
12 | exynos") by dropping the slot@0 nodes, moving its bus-width property to | |
13 | the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, | |
14 | matching exynos5250-snow. | |
15 | ||
16 | Cc: Jaehoon Chung <jh80.chung@samsung.com> | |
17 | Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") | |
18 | Signed-off-by: Andreas Faerber <afaerber@suse.de> | |
19 | Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> | |
20 | Signed-off-by: Kukjin Kim <kgene@kernel.org> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ | |
25 | 1 file changed, 4 insertions(+), 12 deletions(-) | |
26 | ||
27 | --- a/arch/arm/boot/dts/exynos5250-spring.dts | |
28 | +++ b/arch/arm/boot/dts/exynos5250-spring.dts | |
29 | @@ -429,7 +429,6 @@ | |
30 | &mmc_0 { | |
31 | status = "okay"; | |
32 | num-slots = <1>; | |
33 | - supports-highspeed; | |
34 | broken-cd; | |
35 | card-detect-delay = <200>; | |
36 | samsung,dw-mshc-ciu-div = <3>; | |
37 | @@ -437,11 +436,8 @@ | |
38 | samsung,dw-mshc-ddr-timing = <1 2>; | |
39 | pinctrl-names = "default"; | |
40 | pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; | |
41 | - | |
42 | - slot@0 { | |
43 | - reg = <0>; | |
44 | - bus-width = <8>; | |
45 | - }; | |
46 | + bus-width = <8>; | |
47 | + cap-mmc-highspeed; | |
48 | }; | |
49 | ||
50 | /* | |
51 | @@ -451,7 +447,6 @@ | |
52 | &mmc_1 { | |
53 | status = "okay"; | |
54 | num-slots = <1>; | |
55 | - supports-highspeed; | |
56 | broken-cd; | |
57 | card-detect-delay = <200>; | |
58 | samsung,dw-mshc-ciu-div = <3>; | |
59 | @@ -459,11 +454,8 @@ | |
60 | samsung,dw-mshc-ddr-timing = <1 2>; | |
61 | pinctrl-names = "default"; | |
62 | pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>; | |
63 | - | |
64 | - slot@0 { | |
65 | - reg = <0>; | |
66 | - bus-width = <4>; | |
67 | - }; | |
68 | + bus-width = <4>; | |
69 | + cap-sd-highspeed; | |
70 | }; | |
71 | ||
72 | &pinctrl_0 { |