diff options
author | Andreas Faerber <afaerber@suse.de> | 2015-03-17 17:25:18 +0100 |
---|---|---|
committer | Kukjin Kim <kgene@kernel.org> | 2015-03-17 17:25:44 +0100 |
commit | 7e9e20b1faab02357501553d7f4e3efec1b4cfd3 (patch) | |
tree | b2b6cc25407d5dc21054279a0bf2ddada60913c5 /README | |
parent | Linux 4.0-rc1 (diff) | |
download | linux-7e9e20b1faab02357501553d7f4e3efec1b4cfd3.tar.xz linux-7e9e20b1faab02357501553d7f4e3efec1b4cfd3.zip |
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>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions