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

Mohammed, Afzal afzal at ti.com
Fri Jul 13 02:14:08 EDT 2012


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 at 44e35000 {
+                       compatible = "ti,omap3-wdt";
+                       ti,hwmods = "wd_timer2";
+               };
        };
 };


More information about the linux-arm-kernel mailing list