[GIT,PULL,1/5] omap device tree changes for v3.6 merge window

Commit Message

Tony Lindgren Aug. 7, 2012, 7:13 a.m. UTC

* Tony Lindgren <[e-mail]> [120713 01:01]:
> * Tony Lindgren <[e-mail]> [120712 23:46]:
> > * Mohammed, Afzal <[e-mail]> [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 <[e-mail]>
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 <[e-mail]>
[[e-mail]: I messed up and produced an empty commit db27ac80 with stg apply]
Signed-off-by: Tony Lindgren <[e-mail]>

Comments

Afzal Mohammed Aug. 7, 2012, 7:29 a.m. UTC | #1

On Tue, Aug 07, 2012 at 12:43:51, Tony Lindgren wrote:
> * Tony Lindgren <[e-mail]> [120713 01:01]:
> > * Tony Lindgren <[e-mail]> [120712 23:46]:

> > > 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.

Thanks Tony

Regards
Afzal

Patch

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";
+		};
 	};
 };