Commit e4f3adf8 authored by Andreas Faerber's avatar Andreas Faerber Committed by Greg Kroah-Hartman
Browse files

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



commit 7e9e20b1 upstream.

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>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30dc8297
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment