From patchwork Tue Aug 7 07:13:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 1283751 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0FDF0DF280 for ; Tue, 7 Aug 2012 07:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751852Ab2HGHN5 (ORCPT ); Tue, 7 Aug 2012 03:13:57 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:43544 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722Ab2HGHN4 (ORCPT ); Tue, 7 Aug 2012 03:13:56 -0400 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1SydzG-000Dup-69; Tue, 07 Aug 2012 07:13:54 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1//QmG5Ri5OjvuAmkm/uD89 Date: Tue, 7 Aug 2012 00:13:51 -0700 From: Tony Lindgren To: "Mohammed, Afzal" Cc: Arnd Bergmann , Olof Johansson , "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window Message-ID: <20120807071351.GK11011@atomide.com> References: <20120713064147.GG1122@atomide.com> <20120713075658.GQ1122@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120713075658.GQ1122@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * Tony Lindgren [120713 01:01]: > * Tony Lindgren [120712 23:46]: > > * Mohammed, Afzal [120712 23:19]: > > > > 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. > > > > Argh. Thanks for letting me know. I must have something wrong with > > my scripts when applying patches. We'll have to apply this as a fix. > > Arnd and Olof, let me know if you want me to resubmit a new branch instead > of the already pulled devel-dt branch. That branch should not have other > dependencies as it's based on -rc5. Of course is it's buried into other > DT patches it's too late. Now with -rc1 out, I'll queue the following fix. Regards, Tony From: Afzal Mohammed Date: Wed, 4 Jul 2012 18:00:37 +0530 Subject: [PATCH] arm/dts: Fix am33xx wdt node Add am33xx wdt node. Signed-off-by: Afzal Mohammed [tony@atomide.com: I messed up and produced an empty commit db27ac80 with stg apply] Signed-off-by: Tony Lindgren --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 59509c4..bd0cff3 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -154,5 +154,10 @@ #size-cells = <0>; ti,hwmods = "i2c3"; }; + + wdt2: wdt@44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; };