1 files changed, 102 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 696e929d0304..1acc26148ffc 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -12,6 +12,7 @@
 / {
        compatible = "ti,omap3430", "ti,omap3";
+        interrupt-parent = <&intc>;
        aliases {
                serial0 = &uart1;
@@ -60,6 +61,12 @@
                ranges;
                ti,hwmods = "l3_main";
+                counter32k: counter@48320000 {
+                        compatible = "ti,omap-counter32k";
+                        reg = <0x48320000 0x20>;
+                        ti,hwmods = "counter_32k";
+                };
                intc: interrupt-controller@48200000 {
                        compatible = "ti,omap2-intc";
                        interrupt-controller;
@@ -240,7 +247,6 @@
                                     <59>, /* TX interrupt */
                                     <60>; /* RX interrupt */
                        interrupt-names = "common", "tx", "rx";
-                        interrupt-parent = <&intc>;
                        ti,buffer-size = <128>;
                        ti,hwmods = "mcbsp1";
                };
@@ -255,7 +261,6 @@
                                     <63>, /* RX interrupt */
                                     <4>;  /* Sidetone */
                        interrupt-names = "common", "tx", "rx", "sidetone";
-                        interrupt-parent = <&intc>;
                        ti,buffer-size = <1280>;
                        ti,hwmods = "mcbsp2", "mcbsp2_sidetone";
                };
@@ -270,7 +275,6 @@
                                     <90>, /* RX interrupt */
                                     <5>;  /* Sidetone */
                        interrupt-names = "common", "tx", "rx", "sidetone";
-                        interrupt-parent = <&intc>;
                        ti,buffer-size = <128>;
                        ti,hwmods = "mcbsp3", "mcbsp3_sidetone";
                };
@@ -283,7 +287,6 @@
                                     <54>, /* TX interrupt */
                                     <55>; /* RX interrupt */
                        interrupt-names = "common", "tx", "rx";
-                        interrupt-parent = <&intc>;
                        ti,buffer-size = <128>;
                        ti,hwmods = "mcbsp4";
                };
@@ -296,9 +299,103 @@
                                     <81>, /* TX interrupt */
                                     <82>; /* RX interrupt */
                        interrupt-names = "common", "tx", "rx";
-                        interrupt-parent = <&intc>;
                        ti,buffer-size = <128>;
                        ti,hwmods = "mcbsp5";
                };
+                timer1: timer@48318000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x48318000 0x400>;
+                        interrupts = <37>;
+                        ti,hwmods = "timer1";
+                        ti,timer-alwon;
+                };
+                timer2: timer@49032000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x49032000 0x400>;
+                        interrupts = <38>;
+                        ti,hwmods = "timer2";
+                };
+                timer3: timer@49034000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x49034000 0x400>;
+                        interrupts = <39>;
+                        ti,hwmods = "timer3";
+                };
+                timer4: timer@49036000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x49036000 0x400>;
+                        interrupts = <40>;
+                        ti,hwmods = "timer4";
+                };
+                timer5: timer@49038000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x49038000 0x400>;
+                        interrupts = <41>;
+                        ti,hwmods = "timer5";
+                        ti,timer-dsp;
+                };
+                timer6: timer@4903a000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x4903a000 0x400>;
+                        interrupts = <42>;
+                        ti,hwmods = "timer6";
+                        ti,timer-dsp;
+                };
+                timer7: timer@4903c000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x4903c000 0x400>;
+                        interrupts = <43>;
+                        ti,hwmods = "timer7";
+                        ti,timer-dsp;
+                };
+                timer8: timer@4903e000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x4903e000 0x400>;
+                        interrupts = <44>;
+                        ti,hwmods = "timer8";
+                        ti,timer-pwm;
+                        ti,timer-dsp;
+                };
+                timer9: timer@49040000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x49040000 0x400>;
+                        interrupts = <45>;
+                        ti,hwmods = "timer9";
+                        ti,timer-pwm;
+                };
+                timer10: timer@48086000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x48086000 0x400>;
+                        interrupts = <46>;
+                        ti,hwmods = "timer10";
+                        ti,timer-pwm;
+                };
+                timer11: timer@48088000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x48088000 0x400>;
+                        interrupts = <47>;
+                        ti,hwmods = "timer11";
+                        ti,timer-pwm;
+                };
+                timer12: timer@48304000 {
+                        compatible = "ti,omap2-timer";
+                        reg = <0x48304000 0x400>;
+                        interrupts = <95>;
+                        ti,hwmods = "timer12";
+                        ti,timer-alwon;
+                        ti,timer-secure;
+                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 696e929d0304..1acc26148ffc 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi
@@ -12,6 +12,7 @@
12		12
13	/ {	13	/ {
14	compatible = "ti,omap3430", "ti,omap3";	14	compatible = "ti,omap3430", "ti,omap3";
		15	interrupt-parent = <&intc>;
15		16
16	aliases {	17	aliases {
17	serial0 = &uart1;	18	serial0 = &uart1;
@@ -60,6 +61,12 @@
60	ranges;	61	ranges;
61	ti,hwmods = "l3_main";	62	ti,hwmods = "l3_main";
62		63
		64	counter32k: counter@48320000 {
		65	compatible = "ti,omap-counter32k";
		66	reg = <0x48320000 0x20>;
		67	ti,hwmods = "counter_32k";
		68	};
		69
63	intc: interrupt-controller@48200000 {	70	intc: interrupt-controller@48200000 {
64	compatible = "ti,omap2-intc";	71	compatible = "ti,omap2-intc";
65	interrupt-controller;	72	interrupt-controller;
@@ -240,7 +247,6 @@
240	<59>, /* TX interrupt */	247	<59>, /* TX interrupt */
241	<60>; /* RX interrupt */	248	<60>; /* RX interrupt */
242	interrupt-names = "common", "tx", "rx";	249	interrupt-names = "common", "tx", "rx";
243	interrupt-parent = <&intc>;
244	ti,buffer-size = <128>;	250	ti,buffer-size = <128>;
245	ti,hwmods = "mcbsp1";	251	ti,hwmods = "mcbsp1";
246	};	252	};
@@ -255,7 +261,6 @@
255	<63>, /* RX interrupt */	261	<63>, /* RX interrupt */
256	<4>; /* Sidetone */	262	<4>; /* Sidetone */
257	interrupt-names = "common", "tx", "rx", "sidetone";	263	interrupt-names = "common", "tx", "rx", "sidetone";
258	interrupt-parent = <&intc>;
259	ti,buffer-size = <1280>;	264	ti,buffer-size = <1280>;
260	ti,hwmods = "mcbsp2", "mcbsp2_sidetone";	265	ti,hwmods = "mcbsp2", "mcbsp2_sidetone";
261	};	266	};
@@ -270,7 +275,6 @@
270	<90>, /* RX interrupt */	275	<90>, /* RX interrupt */
271	<5>; /* Sidetone */	276	<5>; /* Sidetone */
272	interrupt-names = "common", "tx", "rx", "sidetone";	277	interrupt-names = "common", "tx", "rx", "sidetone";
273	interrupt-parent = <&intc>;
274	ti,buffer-size = <128>;	278	ti,buffer-size = <128>;
275	ti,hwmods = "mcbsp3", "mcbsp3_sidetone";	279	ti,hwmods = "mcbsp3", "mcbsp3_sidetone";
276	};	280	};
@@ -283,7 +287,6 @@
283	<54>, /* TX interrupt */	287	<54>, /* TX interrupt */
284	<55>; /* RX interrupt */	288	<55>; /* RX interrupt */
285	interrupt-names = "common", "tx", "rx";	289	interrupt-names = "common", "tx", "rx";
286	interrupt-parent = <&intc>;
287	ti,buffer-size = <128>;	290	ti,buffer-size = <128>;
288	ti,hwmods = "mcbsp4";	291	ti,hwmods = "mcbsp4";
289	};	292	};
@@ -296,9 +299,103 @@
296	<81>, /* TX interrupt */	299	<81>, /* TX interrupt */
297	<82>; /* RX interrupt */	300	<82>; /* RX interrupt */
298	interrupt-names = "common", "tx", "rx";	301	interrupt-names = "common", "tx", "rx";
299	interrupt-parent = <&intc>;
300	ti,buffer-size = <128>;	302	ti,buffer-size = <128>;
301	ti,hwmods = "mcbsp5";	303	ti,hwmods = "mcbsp5";
302	};	304	};
		305
		306	timer1: timer@48318000 {
		307	compatible = "ti,omap2-timer";
		308	reg = <0x48318000 0x400>;
		309	interrupts = <37>;
		310	ti,hwmods = "timer1";
		311	ti,timer-alwon;
		312	};
		313
		314	timer2: timer@49032000 {
		315	compatible = "ti,omap2-timer";
		316	reg = <0x49032000 0x400>;
		317	interrupts = <38>;
		318	ti,hwmods = "timer2";
		319	};
		320
		321	timer3: timer@49034000 {
		322	compatible = "ti,omap2-timer";
		323	reg = <0x49034000 0x400>;
		324	interrupts = <39>;
		325	ti,hwmods = "timer3";
		326	};
		327
		328	timer4: timer@49036000 {
		329	compatible = "ti,omap2-timer";
		330	reg = <0x49036000 0x400>;
		331	interrupts = <40>;
		332	ti,hwmods = "timer4";
		333	};
		334
		335	timer5: timer@49038000 {
		336	compatible = "ti,omap2-timer";
		337	reg = <0x49038000 0x400>;
		338	interrupts = <41>;
		339	ti,hwmods = "timer5";
		340	ti,timer-dsp;
		341	};
		342
		343	timer6: timer@4903a000 {
		344	compatible = "ti,omap2-timer";
		345	reg = <0x4903a000 0x400>;
		346	interrupts = <42>;
		347	ti,hwmods = "timer6";
		348	ti,timer-dsp;
		349	};
		350
		351	timer7: timer@4903c000 {
		352	compatible = "ti,omap2-timer";
		353	reg = <0x4903c000 0x400>;
		354	interrupts = <43>;
		355	ti,hwmods = "timer7";
		356	ti,timer-dsp;
		357	};
		358
		359	timer8: timer@4903e000 {
		360	compatible = "ti,omap2-timer";
		361	reg = <0x4903e000 0x400>;
		362	interrupts = <44>;
		363	ti,hwmods = "timer8";
		364	ti,timer-pwm;
		365	ti,timer-dsp;
		366	};
		367
		368	timer9: timer@49040000 {
		369	compatible = "ti,omap2-timer";
		370	reg = <0x49040000 0x400>;
		371	interrupts = <45>;
		372	ti,hwmods = "timer9";
		373	ti,timer-pwm;
		374	};
		375
		376	timer10: timer@48086000 {
		377	compatible = "ti,omap2-timer";
		378	reg = <0x48086000 0x400>;
		379	interrupts = <46>;
		380	ti,hwmods = "timer10";
		381	ti,timer-pwm;
		382	};
		383
		384	timer11: timer@48088000 {
		385	compatible = "ti,omap2-timer";
		386	reg = <0x48088000 0x400>;
		387	interrupts = <47>;
		388	ti,hwmods = "timer11";
		389	ti,timer-pwm;
		390	};
		391
		392	timer12: timer@48304000 {
		393	compatible = "ti,omap2-timer";
		394	reg = <0x48304000 0x400>;
		395	interrupts = <95>;
		396	ti,hwmods = "timer12";
		397	ti,timer-alwon;
		398	ti,timer-secure;
		399	};
303	};	400	};
304	};	401	};