---

yaml --- r: 377143 b: refs/heads/master c: 8341613 h: refs/heads/master i: 377141: 0769641 377139: 4cc5f25 377135: 90a15d0 v: v3
git-mirror · Jun 3, 2013 · 15a4566 · 15a4566
1 parent 6d5f232
commit 15a4566
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e68f43b7dcf0e5eee10baeb3cbe4e1ca59db9fd
+refs/heads/master: 8341613afbc8d65bca8c81158edfb49f36b7ad92
diff --git a/trunk/arch/arm/boot/dts/omap5.dtsi b/trunk/arch/arm/boot/dts/omap5.dtsi
@@ -538,6 +538,7 @@
 			interrupts = <0 41 0x4>;
 			ti,hwmods = "timer5";
 			ti,timer-dsp;
+			ti,timer-pwm;
 		};
 
 		timer6: timer@4013a000 {
@@ -574,13 +575,15 @@
 			reg = <0x4803e000 0x80>;
 			interrupts = <0 45 0x4>;
 			ti,hwmods = "timer9";
+			ti,timer-pwm;
 		};
 
 		timer10: timer@48086000 {
 			compatible = "ti,omap5430-timer";
 			reg = <0x48086000 0x80>;
 			interrupts = <0 46 0x4>;
 			ti,hwmods = "timer10";
+			ti,timer-pwm;
 		};
 
 		timer11: timer@48088000 {