From: "Mohammed, Afzal" <afzal@ti.com> To: Tony Lindgren <tony@atomide.com>, Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net> Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: RE: [GIT PULL 1/5] omap device tree changes for v3.6 merge window Date: Fri, 13 Jul 2012 06:14:08 +0000 [thread overview] Message-ID: <C8443D0743D26F4388EA172BF4E2A7A93E9A8BE1@DBDE01.ent.ti.com> (raw) In-Reply-To: <pull-1341925556-888624> Hi Tony, On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote: > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6 > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89: > > arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700) > > ---------------------------------------------------------------- > Device tree related patches for omaps > > ---------------------------------------------------------------- > Afzal Mohammed (1): > arm/dts: am33xx wdt node The above patch seems to be an empty one, actual changes in it as in original patch [1] is missing, same changes are shown below for your reference [2]. Can you please do the needful so that the intended change of this patch makes to mainline this merge window. Regards Afzal [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html [2] diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index f46e353..08b2a5b 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -185,5 +185,10 @@ compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc3"; }; + + wdt2: wdt@44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; };
WARNING: multiple messages have this Message-ID (diff)
From: afzal@ti.com (Mohammed, Afzal) To: linux-arm-kernel@lists.infradead.org Subject: [GIT PULL 1/5] omap device tree changes for v3.6 merge window Date: Fri, 13 Jul 2012 06:14:08 +0000 [thread overview] Message-ID: <C8443D0743D26F4388EA172BF4E2A7A93E9A8BE1@DBDE01.ent.ti.com> (raw) In-Reply-To: <pull-1341925556-888624> Hi Tony, On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote: > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6 > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89: > > arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700) > > ---------------------------------------------------------------- > Device tree related patches for omaps > > ---------------------------------------------------------------- > Afzal Mohammed (1): > arm/dts: am33xx wdt node The above patch seems to be an empty one, actual changes in it as in original patch [1] is missing, same changes are shown below for your reference [2]. Can you please do the needful so that the intended change of this patch makes to mainline this merge window. Regards Afzal [1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg71644.html [2] diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index f46e353..08b2a5b 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -185,5 +185,10 @@ compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc3"; }; + + wdt2: wdt at 44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; };
next prev parent reply other threads:[~2012-07-13 6:14 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-10 13:05 [GIT PULL 1/5] omap device tree changes for v3.6 merge window Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 2/5] omap board " Tony Lindgren 2012-07-10 13:05 ` Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 3/5] omap cleanup part2 " Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren 2012-07-10 13:05 ` Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 3/5] omap cleanup part2 " Tony Lindgren 2012-07-10 13:05 ` [GIT PULL 4/5] am33xx data " Tony Lindgren 2012-07-10 13:05 ` Tony Lindgren [not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org> 2012-07-10 13:42 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren 2012-07-10 13:42 ` Tony Lindgren 2012-07-10 15:53 ` Arnd Bergmann 2012-07-10 15:53 ` Arnd Bergmann 2012-07-11 6:04 ` Tony Lindgren 2012-07-11 6:04 ` Tony Lindgren 2012-07-13 6:14 ` Mohammed, Afzal [this message] 2012-07-13 6:14 ` [GIT PULL 1/5] omap device tree changes " Mohammed, Afzal 2012-07-13 6:41 ` Tony Lindgren 2012-07-13 6:41 ` Tony Lindgren 2012-07-13 7:56 ` Tony Lindgren 2012-07-13 7:56 ` Tony Lindgren 2012-08-07 7:13 ` Tony Lindgren 2012-08-07 7:13 ` Tony Lindgren 2012-08-07 7:29 ` Mohammed, Afzal 2012-08-07 7:29 ` Mohammed, Afzal -- strict thread matches above, loose matches on Subject: below -- 2012-07-10 13:05 Tony Lindgren 2012-07-10 13:05 Tony Lindgren
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=C8443D0743D26F4388EA172BF4E2A7A93E9A8BE1@DBDE01.ent.ti.com \ --to=afzal@ti.com \ --cc=arnd@arndb.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=olof@lixom.net \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.