From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Subject: Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes Date: Mon, 16 Mar 2015 15:55:53 +0100 Message-ID: <5506EEF9.7080100@suse.de> References: <1424275812-6797-1-git-send-email-afaerber@suse.de> <54E5CD2E.9070608@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <54E5CD2E.9070608-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Kukjin Kim Cc: Javier Martinez Canillas , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Vincent Palatin , Doug Anderson , Tomasz Figa , Jaehoon Chung , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , LKML List-Id: devicetree@vger.kernel.org Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas: > Hello Andreas, >=20 > On 02/18/2015 05:10 PM, Andreas F=C3=A4rber wrote: >> Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dt= s: >> 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}-high= speed, >> matching exynos5250-snow. >> >> Cc: Jaehoon Chung >> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") >> Signed-off-by: Andreas F=C3=A4rber >> --- >> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ >> 1 file changed, 4 insertions(+), 12 deletions(-) >> >=20 > Reviewed-by: Javier Martinez Canillas Ping! >=20 > Best regards, > Javier --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Felix Imend=C3=B6rffer, Jane Smithard, Jennifer Guild, Dilip Upmany= u, Graham Norton; HRB 21284 (AG N=C3=BCrnberg) -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html