raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

ARM: dts: fix mmc node updates for exynos5250-spring

Browse Source 
commit 7e9e20b1fa upstream.

Resolve a merge conflict with mmc refactoring aaa25a5a33 ("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: 53dd4138bb ("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>
This commit is contained in:
Andreas Faerber
2015-03-18 01:25:18 +09:00
committed by Greg Kroah-Hartman
parent 5b126c3890
commit 422be9a5e0
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/exynos5250-spring.dts
View File

@@ -429,7 +429,6 @@
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>; num-slots = <1>;
supports-highspeed;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
@@ -437,11 +436,8 @@
samsung,dw-mshc-ddr-timing = <1 2>; samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; 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 { &mmc_1 {
status = "okay"; status = "okay";
num-slots = <1>; num-slots = <1>;
supports-highspeed;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
@@ -459,11 +454,8 @@
samsung,dw-mshc-ddr-timing = <1 2>; samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>; 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 { &pinctrl_0 {