Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e9e20b1 authored by Andreas Faerber's avatar Andreas Faerber Committed by Kukjin Kim
Browse files

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



Resolve a merge conflict with mmc refactoring aaa25a5a ("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: 53dd4138 ("ARM: dts: Add exynos5250-spring device tree")
Signed-off-by: default avatarAndreas Faerber <afaerber@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Cc: <stable@vger.kernel.org>        [3.19+]
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
parent c517d838

arch/arm/boot/dts/exynos5250-spring.dts

+4 −12
Original line number Diff line number Diff line
@@ -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>;

	};

	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>;

	};

	cap-sd-highspeed;

};



&pinctrl_0 {