diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-08-30 13:47:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-08-30 13:47:23 -0700 |
| commit | 39b1bb2e0cdf9042505a138ea93520f39a2b3d48 (patch) | |
| tree | 71d5fa580aea0f289f123c9445058a81b81f4583 /arch/arm/boot/dts/am33xx.dtsi | |
| parent | 85d7ff9b907685b6469058888f1d961b3e8d47ad (diff) | |
| parent | 624411ceba816b38e9e4a013c7e4c5f36a9f4cfe (diff) | |
| download | op-kernel-dev-39b1bb2e0cdf9042505a138ea93520f39a2b3d48.zip op-kernel-dev-39b1bb2e0cdf9042505a138ea93520f39a2b3d48.tar.gz | |
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 5f6c8e3..dde76f7 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"; + }; }; }; |
