From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] omap device tree changes for v4.6 merge window, part 1
Date: Fri, 26 Feb 2016 13:58:21 -0800 [thread overview]
Message-ID: <20160226215820.GK13417@atomide.com> (raw)
In-Reply-To: <6026634.ihuvqopRan@wuerfel>
* Arnd Bergmann <arnd@arndb•de> [160226 13:35]:
> On Monday 22 February 2016 13:56:12 Tony Lindgren wrote:
> > Device tree changes for omaps for v4.6 merge window. Mostly just
> > adding board specific devices and few new boards:
>
> Pulled into next/dt, with a trivial conflict resolution:
>
> --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> @@@ -110,6 -110,19 +110,11 @@@
>
> &i2c3 {
> clock-frequency = <400000>;
> -};
> -
> -&i2c2 {
> - clock-frequency = <400000>;
> -};
> -
> -&i2c3 {
> - clock-frequency = <400000>;
> + at24 at 50 {
> + compatible = "at24,24c02";
> + readonly;
> + reg = <0x50>;
> + };
> };
>
> /*
OK looks god to me thanks.
Tony
prev parent reply other threads:[~2016-02-26 21:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 21:56 [GIT PULL] omap device tree changes for v4.6 merge window, part 1 Tony Lindgren
2016-02-26 21:35 ` Arnd Bergmann
2016-02-26 21:58 ` Tony Lindgren [this message]
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=20160226215820.GK13417@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