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

Browse source

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

...

This commit is contained in:

Andreas Faerber 2015-03-18 01:25:18 +09:00 • committed by Kukjin Kim

parent c517d838eb

commit 7e9e20b1fa

1 changed files with 4 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

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

View file