From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 2/2] omap overo related device tree changes for v3.15
Date: Mon, 17 Mar 2014 09:50:26 -0700 [thread overview]
Message-ID: <20140317165026.GB30471@atomide.com> (raw)
In-Reply-To: <201403171518.43389.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb•de> [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
next prev parent reply other threads:[~2014-03-17 16:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 20:01 [GIT PULL 1/2] omap device tree changes for v3.15, part 3 Tony Lindgren
2014-03-13 20:02 ` [GIT PULL 2/2] omap overo related device tree changes for v3.15 Tony Lindgren
2014-03-17 14:18 ` Arnd Bergmann
2014-03-17 16:50 ` Tony Lindgren [this message]
2014-03-17 14:14 ` [GIT PULL 1/2] omap device tree changes for v3.15, part 3 Arnd Bergmann
2014-03-17 16:45 ` Tony Lindgren
2014-03-17 20:55 ` Suman Anna
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140317165026.GB30471@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox