From patchwork Fri Jul 13 06:14:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Afzal Mohammed X-Patchwork-Id: 1193891 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0D3293FC5A for ; Fri, 13 Jul 2012 06:14:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030319Ab2GMGOW (ORCPT ); Fri, 13 Jul 2012 02:14:22 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:53404 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030814Ab2GMGOV (ORCPT ); Fri, 13 Jul 2012 02:14:21 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q6D6ECv8026310; Fri, 13 Jul 2012 01:14:13 -0500 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q6D6E91k024743; Fri, 13 Jul 2012 11:44:10 +0530 (IST) Received: from DBDE01.ent.ti.com ([fe80::d5df:c4b5:9919:4e10]) by DBDE70.ent.ti.com ([fe80::2141:513f:409:315a%21]) with mapi id 14.01.0323.003; Fri, 13 Jul 2012 11:44:09 +0530 From: "Mohammed, Afzal" To: Tony Lindgren , Arnd Bergmann , Olof Johansson CC: "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 Thread-Topic: [GIT PULL 1/5] omap device tree changes for v3.6 merge window Thread-Index: AQHNXpzTskheB/gjz0i68amsy+lFE5cmupZA Date: Fri, 13 Jul 2012 06:14:08 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.24.170.142] MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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"; + }; }; };