Commit 52ddb6d9 authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren

ARM: dts: omap5: Add timer_sys_ck clocks for timers

The commit d41e5304 ("clk: ti: omap5: cleanup unnecessary clock
aliases") has cleaned up all timer_sys_ck clock aliases and retained
only the timer_32k_ck clock alias. The OMAP clocksource timer driver
though still uses this clock alias when reconfiguring the parent
clock source for the timer functional clocks, so add these clocks
to all the timer nodes except for the always-on timers 1 and 12.

This is required by the OMAP remoteproc driver to successfully
acquire a timer and configure the source clock to be driven from
timer_sys_ck clock.
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 214ec031
...@@ -298,8 +298,9 @@ timer5: timer@0 { ...@@ -298,8 +298,9 @@ timer5: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>, reg = <0x0 0x80>,
<0x49038000 0x80>; <0x49038000 0x80>;
clocks = <&abe_clkctrl OMAP5_TIMER5_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP5_TIMER5_CLKCTRL 24>,
clock-names = "fck"; <&dss_syc_gfclk_div>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-dsp; ti,timer-dsp;
ti,timer-pwm; ti,timer-pwm;
...@@ -329,8 +330,9 @@ timer6: timer@0 { ...@@ -329,8 +330,9 @@ timer6: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>, reg = <0x0 0x80>,
<0x4903a000 0x80>; <0x4903a000 0x80>;
clocks = <&abe_clkctrl OMAP5_TIMER6_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP5_TIMER6_CLKCTRL 24>,
clock-names = "fck"; <&dss_syc_gfclk_div>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-dsp; ti,timer-dsp;
ti,timer-pwm; ti,timer-pwm;
...@@ -360,8 +362,9 @@ timer7: timer@0 { ...@@ -360,8 +362,9 @@ timer7: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>, reg = <0x0 0x80>,
<0x4903c000 0x80>; <0x4903c000 0x80>;
clocks = <&abe_clkctrl OMAP5_TIMER7_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP5_TIMER7_CLKCTRL 24>,
clock-names = "fck"; <&dss_syc_gfclk_div>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-dsp; ti,timer-dsp;
}; };
...@@ -390,8 +393,9 @@ timer8: timer@0 { ...@@ -390,8 +393,9 @@ timer8: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>, reg = <0x0 0x80>,
<0x4903e000 0x80>; <0x4903e000 0x80>;
clocks = <&abe_clkctrl OMAP5_TIMER8_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP5_TIMER8_CLKCTRL 24>,
clock-names = "fck"; <&dss_syc_gfclk_div>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-dsp; ti,timer-dsp;
ti,timer-pwm; ti,timer-pwm;
......
...@@ -1082,8 +1082,9 @@ target-module@32000 { /* 0x48032000, ap 5 3e.0 */ ...@@ -1082,8 +1082,9 @@ target-module@32000 { /* 0x48032000, ap 5 3e.0 */
timer2: timer@0 { timer2: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER2_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER2_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
...@@ -1109,8 +1110,9 @@ target-module@34000 { /* 0x48034000, ap 7 46.0 */ ...@@ -1109,8 +1110,9 @@ target-module@34000 { /* 0x48034000, ap 7 46.0 */
timer3: timer@0 { timer3: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER3_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER3_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
...@@ -1136,8 +1138,9 @@ target-module@36000 { /* 0x48036000, ap 9 4e.0 */ ...@@ -1136,8 +1138,9 @@ target-module@36000 { /* 0x48036000, ap 9 4e.0 */
timer4: timer@0 { timer4: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER4_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER4_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
...@@ -1163,8 +1166,9 @@ target-module@3e000 { /* 0x4803e000, ap 11 56.0 */ ...@@ -1163,8 +1166,9 @@ target-module@3e000 { /* 0x4803e000, ap 11 56.0 */
timer9: timer@0 { timer9: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER9_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER9_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm; ti,timer-pwm;
}; };
...@@ -1730,8 +1734,9 @@ target-module@86000 { /* 0x48086000, ap 41 5e.0 */ ...@@ -1730,8 +1734,9 @@ target-module@86000 { /* 0x48086000, ap 41 5e.0 */
timer10: timer@0 { timer10: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER10_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER10_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm; ti,timer-pwm;
}; };
...@@ -1758,8 +1763,9 @@ target-module@88000 { /* 0x48088000, ap 43 66.0 */ ...@@ -1758,8 +1763,9 @@ target-module@88000 { /* 0x48088000, ap 43 66.0 */
timer11: timer@0 { timer11: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4per_clkctrl OMAP5_TIMER11_CLKCTRL 24>; clocks = <&l4per_clkctrl OMAP5_TIMER11_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm; ti,timer-pwm;
}; };
...@@ -2387,8 +2393,9 @@ timer1_target: target-module@8000 { /* 0x4ae18000, ap 9 18.0 */ ...@@ -2387,8 +2393,9 @@ timer1_target: target-module@8000 { /* 0x4ae18000, ap 9 18.0 */
timer1: timer@0 { timer1: timer@0 {
compatible = "ti,omap5430-timer"; compatible = "ti,omap5430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&wkupaon_clkctrl OMAP5_TIMER1_CLKCTRL 24>; clocks = <&wkupaon_clkctrl OMAP5_TIMER1_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-alwon; ti,timer-alwon;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment