tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: omap5: Add timer_sys_ck clocks for timers

The commit d41e53040926 ("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: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Suman Anna and committed by
Tony Lindgren 52ddb6d9 214ec031

+33 -22
+12 -8
arch/arm/boot/dts/omap5-l4-abe.dtsi
··· 298 298 compatible = "ti,omap5430-timer"; 299 299 reg = <0x0 0x80>, 300 300 <0x49038000 0x80>; 301 - clocks = <&abe_clkctrl OMAP5_TIMER5_CLKCTRL 24>; 302 - clock-names = "fck"; 301 + clocks = <&abe_clkctrl OMAP5_TIMER5_CLKCTRL 24>, 302 + <&dss_syc_gfclk_div>; 303 + clock-names = "fck", "timer_sys_ck"; 303 304 interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; 304 305 ti,timer-dsp; 305 306 ti,timer-pwm; ··· 330 329 compatible = "ti,omap5430-timer"; 331 330 reg = <0x0 0x80>, 332 331 <0x4903a000 0x80>; 333 - clocks = <&abe_clkctrl OMAP5_TIMER6_CLKCTRL 24>; 334 - clock-names = "fck"; 332 + clocks = <&abe_clkctrl OMAP5_TIMER6_CLKCTRL 24>, 333 + <&dss_syc_gfclk_div>; 334 + clock-names = "fck", "timer_sys_ck"; 335 335 interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; 336 336 ti,timer-dsp; 337 337 ti,timer-pwm; ··· 362 360 compatible = "ti,omap5430-timer"; 363 361 reg = <0x0 0x80>, 364 362 <0x4903c000 0x80>; 365 - clocks = <&abe_clkctrl OMAP5_TIMER7_CLKCTRL 24>; 366 - clock-names = "fck"; 363 + clocks = <&abe_clkctrl OMAP5_TIMER7_CLKCTRL 24>, 364 + <&dss_syc_gfclk_div>; 365 + clock-names = "fck", "timer_sys_ck"; 367 366 interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; 368 367 ti,timer-dsp; 369 368 }; ··· 393 390 compatible = "ti,omap5430-timer"; 394 391 reg = <0x0 0x80>, 395 392 <0x4903e000 0x80>; 396 - clocks = <&abe_clkctrl OMAP5_TIMER8_CLKCTRL 24>; 397 - clock-names = "fck"; 393 + clocks = <&abe_clkctrl OMAP5_TIMER8_CLKCTRL 24>, 394 + <&dss_syc_gfclk_div>; 395 + clock-names = "fck", "timer_sys_ck"; 398 396 interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; 399 397 ti,timer-dsp; 400 398 ti,timer-pwm;
+21 -14
arch/arm/boot/dts/omap5-l4.dtsi
··· 1082 1082 timer2: timer@0 { 1083 1083 compatible = "ti,omap5430-timer"; 1084 1084 reg = <0x0 0x80>; 1085 - clocks = <&l4per_clkctrl OMAP5_TIMER2_CLKCTRL 24>; 1086 - clock-names = "fck"; 1085 + clocks = <&l4per_clkctrl OMAP5_TIMER2_CLKCTRL 24>, 1086 + <&sys_clkin>; 1087 + clock-names = "fck", "timer_sys_ck"; 1087 1088 interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; 1088 1089 }; 1089 1090 }; ··· 1110 1109 timer3: timer@0 { 1111 1110 compatible = "ti,omap5430-timer"; 1112 1111 reg = <0x0 0x80>; 1113 - clocks = <&l4per_clkctrl OMAP5_TIMER3_CLKCTRL 24>; 1114 - clock-names = "fck"; 1112 + clocks = <&l4per_clkctrl OMAP5_TIMER3_CLKCTRL 24>, 1113 + <&sys_clkin>; 1114 + clock-names = "fck", "timer_sys_ck"; 1115 1115 interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; 1116 1116 }; 1117 1117 }; ··· 1138 1136 timer4: timer@0 { 1139 1137 compatible = "ti,omap5430-timer"; 1140 1138 reg = <0x0 0x80>; 1141 - clocks = <&l4per_clkctrl OMAP5_TIMER4_CLKCTRL 24>; 1142 - clock-names = "fck"; 1139 + clocks = <&l4per_clkctrl OMAP5_TIMER4_CLKCTRL 24>, 1140 + <&sys_clkin>; 1141 + clock-names = "fck", "timer_sys_ck"; 1143 1142 interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; 1144 1143 }; 1145 1144 }; ··· 1166 1163 timer9: timer@0 { 1167 1164 compatible = "ti,omap5430-timer"; 1168 1165 reg = <0x0 0x80>; 1169 - clocks = <&l4per_clkctrl OMAP5_TIMER9_CLKCTRL 24>; 1170 - clock-names = "fck"; 1166 + clocks = <&l4per_clkctrl OMAP5_TIMER9_CLKCTRL 24>, 1167 + <&sys_clkin>; 1168 + clock-names = "fck", "timer_sys_ck"; 1171 1169 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; 1172 1170 ti,timer-pwm; 1173 1171 }; ··· 1734 1730 timer10: timer@0 { 1735 1731 compatible = "ti,omap5430-timer"; 1736 1732 reg = <0x0 0x80>; 1737 - clocks = <&l4per_clkctrl OMAP5_TIMER10_CLKCTRL 24>; 1738 - clock-names = "fck"; 1733 + clocks = <&l4per_clkctrl OMAP5_TIMER10_CLKCTRL 24>, 1734 + <&sys_clkin>; 1735 + clock-names = "fck", "timer_sys_ck"; 1739 1736 interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 1740 1737 ti,timer-pwm; 1741 1738 }; ··· 1763 1758 timer11: timer@0 { 1764 1759 compatible = "ti,omap5430-timer"; 1765 1760 reg = <0x0 0x80>; 1766 - clocks = <&l4per_clkctrl OMAP5_TIMER11_CLKCTRL 24>; 1767 - clock-names = "fck"; 1761 + clocks = <&l4per_clkctrl OMAP5_TIMER11_CLKCTRL 24>, 1762 + <&sys_clkin>; 1763 + clock-names = "fck", "timer_sys_ck"; 1768 1764 interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; 1769 1765 ti,timer-pwm; 1770 1766 }; ··· 2393 2387 timer1: timer@0 { 2394 2388 compatible = "ti,omap5430-timer"; 2395 2389 reg = <0x0 0x80>; 2396 - clocks = <&wkupaon_clkctrl OMAP5_TIMER1_CLKCTRL 24>; 2397 - clock-names = "fck"; 2390 + clocks = <&wkupaon_clkctrl OMAP5_TIMER1_CLKCTRL 24>, 2391 + <&sys_clkin>; 2392 + clock-names = "fck", "timer_sys_ck"; 2398 2393 interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; 2399 2394 ti,timer-alwon; 2400 2395 };