korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: omap4: Add timer_sys_ck clocks for timers

Browse Source 
The commit 1c7de9f27a ("clk: ti: omap4: 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.

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>
This commit is contained in:
Suman Anna 2020-07-09 18:19:42 -05:00 committed by Tony Lindgren
parent abe4e4675d
commit 214ec0319e
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/boot/dts/omap4-l4-abe.dtsi
View File

@ -333,8 +333,9 @@
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x00000000 0x80>, reg = <0x00000000 0x80>,
<0x49038000 0x80>; <0x49038000 0x80>;
clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>,
clock-names = "fck"; <&syc_clk_div_ck>;
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;
}; };
@ -363,8 +364,9 @@
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x00000000 0x80>, reg = <0x00000000 0x80>,
<0x4903a000 0x80>; <0x4903a000 0x80>;
clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>,
clock-names = "fck"; <&syc_clk_div_ck>;
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;
}; };
@ -393,8 +395,9 @@
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x00000000 0x80>, reg = <0x00000000 0x80>,
<0x4903c000 0x80>; <0x4903c000 0x80>;
clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>,
clock-names = "fck"; <&syc_clk_div_ck>;
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;
}; };
@ -423,8 +426,9 @@
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x00000000 0x80>, reg = <0x00000000 0x80>,
<0x4903e000 0x80>; <0x4903e000 0x80>;
clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>,
clock-names = "fck"; <&syc_clk_div_ck>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm; ti,timer-pwm;
ti,timer-dsp; ti,timer-dsp;

35
arch/arm/boot/dts/omap4-l4.dtsi
View File

@ -1163,8 +1163,9 @@
timer1: timer@0 { timer1: timer@0 {
compatible = "ti,omap3430-timer"; compatible = "ti,omap3430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>; clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
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;
}; };
@ -1439,8 +1440,9 @@
timer2: timer@0 { timer2: timer@0 {
compatible = "ti,omap3430-timer"; compatible = "ti,omap3430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
@ -1466,8 +1468,9 @@
timer3: timer@0 { timer3: timer@0 {
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
@ -1493,8 +1496,9 @@
timer4: timer@0 { timer4: timer@0 {
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
clock-names = "fck", "timer_sys_ck";
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };
@ -1520,8 +1524,9 @@
timer9: timer@0 { timer9: timer@0 {
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
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;
}; };
@ -1954,8 +1959,9 @@
timer10: timer@0 { timer10: timer@0 {
compatible = "ti,omap3430-timer"; compatible = "ti,omap3430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
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;
}; };
@ -1982,8 +1988,9 @@
timer11: timer@0 { timer11: timer@0 {
compatible = "ti,omap4430-timer"; compatible = "ti,omap4430-timer";
reg = <0x0 0x80>; reg = <0x0 0x80>;
clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>; clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>,
clock-names = "fck"; <&sys_clkin_ck>;
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;
}; };