From: Tony Lindgren <tony@atomide.com>
Date: Thu, 30 Aug 2012 20:47:23 +0000 (-0700)
Subject: Merge branch 'devel-dt-regulator' into devel-dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=39b1bb2e0cdf9042505a138ea93520f39a2b3d48;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'devel-dt-regulator' into devel-dt
---

39b1bb2e0cdf9042505a138ea93520f39a2b3d48
diff --cc arch/arm/boot/dts/am33xx.dtsi
index 5f6c8e33060f,bd0cff3f808c..dde76f7e81a8
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -161,7 -153,11 +161,12 @@@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			ti,hwmods = "i2c3";
 +			status = "disabled";
  		};
+ 
+ 		wdt2: wdt@44e35000 {
+ 			compatible = "ti,omap3-wdt";
+ 			ti,hwmods = "wd_timer2";
+ 		};
  	};
  };