* Arnd Bergmann <arnd@xxxxxxxx> [140317 07:22]:
> On Thursday 13 March 2014, Tony Lindgren wrote:
> > The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:
> >
> > Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-overo-signed
> >
> > for you to fetch changes up to 28b191118c11719bb27db621425a70be28a40e08:
> >
> > ARM: dts: Add support for the Overo Summit (2014-03-12 10:21:16 -0700)
> >
> > ----------------------------------------------------------------
> > Updates to the .dts files to support more Gumstix boards.
> >
> > These are sent separately from the rest of the .dts changes
> > as these depend on the fixes merged into v3.14-rc4, and
> > needed a bit more time to get updated on the fixes.
>
> Pulled into next/dt, thanks!
>
> I had a trivial merge conflict in omap3-overo.dtsi that I resolved as below.
>
> Arnd
>
> diff --cc arch/arm/boot/dts/omap3-overo.dtsi
> index b08142f,c37b130..69ca7c4
> --- a/arch/arm/boot/dts/omap3-overo.dtsi
> +++ b/arch/arm/boot/dts/omap3-overo.dtsi
> @@@ -91,11 -33,3 +33,6 @@@
> };
> };
>
> - &uart3 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&uart3_pins>;
> - };
> -
> +&mcbsp2 {
> + status = "okay";
> +};
Looks good to me thanks, and looks like I merged it wrong in
my omap-for-v3.15/tmp-merge as mcbsp2 is not defined in
omap3-overo-common-peripherals.dtsi.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
