From: Andreas Faerber <afaerber@suse.de>
Date: Tue, 17 Mar 2015 16:25:18 +0000 (+0900)
Subject: ARM: dts: fix mmc node updates for exynos5250-spring
X-Git-Tag: omap-for-v4.2/o2_dc~56^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e9e20b1faab02357501553d7f4e3efec1b4cfd3;p=pandora-kernel.git

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

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>
Cc: <stable@vger.kernel.org>        [3.19+]
Signed-off-by: Kukjin Kim <kgene@kernel.org>
---

Reading git-diff-tree failed