diff options
author | Tony Lindgren <tony@atomide.com> | 2012-08-30 22:47:23 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-08-30 22:47:23 +0200 |
commit | 39b1bb2e0cdf9042505a138ea93520f39a2b3d48 (patch) | |
tree | 71d5fa580aea0f289f123c9445058a81b81f4583 /arch/arm/boot/dts/am33xx.dtsi | |
parent | ARM: omap: add dtb targets (diff) | |
parent | arm/dts: Cleanup regulator naming and remove @0,1 (diff) | |
download | linux-39b1bb2e0cdf9042505a138ea93520f39a2b3d48.tar.xz linux-39b1bb2e0cdf9042505a138ea93520f39a2b3d48.zip |
Merge branch 'devel-dt-regulator' into devel-dt
Diffstat (limited to 'arch/arm/boot/dts/am33xx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 5f6c8e33060f..dde76f7e81a8 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -163,5 +163,10 @@ ti,hwmods = "i2c3"; status = "disabled"; }; + + wdt2: wdt@44e35000 { + compatible = "ti,omap3-wdt"; + ti,hwmods = "wd_timer2"; + }; }; }; |