From: Suman Anna <s-anna@ti.com> To: Tony Lindgren <tony@atomide.com> Cc: <linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, Tero Kristo <t-kristo@ti.com>, Suman Anna <s-anna@ti.com> Subject: [PATCH 01/13] ARM: dts: omap4: Add timer_sys_ck clocks for timers Date: Thu, 9 Jul 2020 18:19:42 -0500 [thread overview] Message-ID: <20200709231954.1973-2-s-anna@ti.com> (raw) In-Reply-To: <20200709231954.1973-1-s-anna@ti.com> The commit 1c7de9f27a65 ("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> --- arch/arm/boot/dts/omap4-l4-abe.dtsi | 20 ++++++++++------- arch/arm/boot/dts/omap4-l4.dtsi | 35 +++++++++++++++++------------ 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/omap4-l4-abe.dtsi b/arch/arm/boot/dts/omap4-l4-abe.dtsi index a6feb201c569..b2cf5f41e222 100644 --- a/arch/arm/boot/dts/omap4-l4-abe.dtsi +++ b/arch/arm/boot/dts/omap4-l4-abe.dtsi @@ -333,8 +333,9 @@ timer5: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x49038000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -363,8 +364,9 @@ timer6: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903a000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -393,8 +395,9 @@ timer7: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903c000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -423,8 +426,9 @@ timer8: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903e000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; ti,timer-dsp; diff --git a/arch/arm/boot/dts/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi index fcc52121ff09..bf90a683d7b8 100644 --- a/arch/arm/boot/dts/omap4-l4.dtsi +++ b/arch/arm/boot/dts/omap4-l4.dtsi @@ -1163,8 +1163,9 @@ SYSC_OMAP2_SOFTRESET | timer1: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; ti,timer-alwon; }; @@ -1439,8 +1440,9 @@ SYSC_OMAP2_SOFTRESET | timer2: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1466,8 +1468,9 @@ target-module@34000 { /* 0x48034000, ap 7 04.0 */ timer3: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1493,8 +1496,9 @@ target-module@36000 { /* 0x48036000, ap 9 0e.0 */ timer4: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1520,8 +1524,9 @@ target-module@3e000 { /* 0x4803e000, ap 11 08.0 */ timer9: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; @@ -1954,8 +1959,9 @@ SYSC_OMAP2_SOFTRESET | timer10: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; @@ -1982,8 +1988,9 @@ target-module@88000 { /* 0x48088000, ap 45 2e.0 */ timer11: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; -- 2.26.0
WARNING: multiple messages have this Message-ID (diff)
From: Suman Anna <s-anna@ti.com> To: Tony Lindgren <tony@atomide.com> Cc: Tero Kristo <t-kristo@ti.com>, devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/13] ARM: dts: omap4: Add timer_sys_ck clocks for timers Date: Thu, 9 Jul 2020 18:19:42 -0500 [thread overview] Message-ID: <20200709231954.1973-2-s-anna@ti.com> (raw) In-Reply-To: <20200709231954.1973-1-s-anna@ti.com> The commit 1c7de9f27a65 ("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> --- arch/arm/boot/dts/omap4-l4-abe.dtsi | 20 ++++++++++------- arch/arm/boot/dts/omap4-l4.dtsi | 35 +++++++++++++++++------------ 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/omap4-l4-abe.dtsi b/arch/arm/boot/dts/omap4-l4-abe.dtsi index a6feb201c569..b2cf5f41e222 100644 --- a/arch/arm/boot/dts/omap4-l4-abe.dtsi +++ b/arch/arm/boot/dts/omap4-l4-abe.dtsi @@ -333,8 +333,9 @@ timer5: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x49038000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER5_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -363,8 +364,9 @@ timer6: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903a000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER6_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -393,8 +395,9 @@ timer7: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903c000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER7_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; ti,timer-dsp; }; @@ -423,8 +426,9 @@ timer8: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x00000000 0x80>, <0x4903e000 0x80>; - clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>, + <&syc_clk_div_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; ti,timer-dsp; diff --git a/arch/arm/boot/dts/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi index fcc52121ff09..bf90a683d7b8 100644 --- a/arch/arm/boot/dts/omap4-l4.dtsi +++ b/arch/arm/boot/dts/omap4-l4.dtsi @@ -1163,8 +1163,9 @@ SYSC_OMAP2_SOFTRESET | timer1: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; ti,timer-alwon; }; @@ -1439,8 +1440,9 @@ SYSC_OMAP2_SOFTRESET | timer2: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1466,8 +1468,9 @@ target-module@34000 { /* 0x48034000, ap 7 04.0 */ timer3: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1493,8 +1496,9 @@ target-module@36000 { /* 0x48036000, ap 9 0e.0 */ timer4: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; }; }; @@ -1520,8 +1524,9 @@ target-module@3e000 { /* 0x4803e000, ap 11 08.0 */ timer9: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; @@ -1954,8 +1959,9 @@ SYSC_OMAP2_SOFTRESET | timer10: timer@0 { compatible = "ti,omap3430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; @@ -1982,8 +1988,9 @@ target-module@88000 { /* 0x48088000, ap 45 2e.0 */ timer11: timer@0 { compatible = "ti,omap4430-timer"; reg = <0x0 0x80>; - clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>; - clock-names = "fck"; + clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>, + <&sys_clkin_ck>; + clock-names = "fck", "timer_sys_ck"; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; ti,timer-pwm; }; -- 2.26.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-09 23:20 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-09 23:19 [PATCH 00/13] Add IPU & DSP remoteprocs on OMAP4 and OMAP5 Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` Suman Anna [this message] 2020-07-09 23:19 ` [PATCH 01/13] ARM: dts: omap4: Add timer_sys_ck clocks for timers Suman Anna 2020-07-09 23:19 ` [PATCH 02/13] ARM: dts: omap5: " Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 03/13] ARM: dts: omap4: Update the DSP node Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 04/13] ARM: dts: omap4: Add IPU DT node Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 05/13] ARM: dts: omap4: Add aliases for rproc nodes Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 06/13] ARM: dts: omap4-panda-common: Add CMA pools and enable IPU & DSP Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-08-12 5:31 ` Guillaume Tucker 2020-08-12 5:31 ` Guillaume Tucker 2020-08-14 14:32 ` Guillaume Tucker 2020-08-14 14:32 ` Guillaume Tucker 2020-08-14 15:26 ` Suman Anna 2020-08-14 15:26 ` Suman Anna 2020-08-14 16:33 ` Guillaume Tucker 2020-08-14 16:33 ` Guillaume Tucker 2020-08-14 19:33 ` Suman Anna 2020-08-14 19:33 ` Suman Anna 2020-08-20 9:17 ` Guillaume Tucker 2020-08-20 9:17 ` Guillaume Tucker 2020-07-09 23:19 ` [PATCH 07/13] ARM: dts: omap4-panda-common:: Add system timers to DSP and IPU Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 08/13] ARM: dts: omap5: Add DSP and IPU nodes Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 09/13] ARM: dts: omap5: Add aliases for rproc nodes Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 10/13] ARM: dts: omap5-uevm: Add CMA pools and enable IPU & DSP Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 11/13] ARM: dts: omap5-uevm: Add system timers to DSP and IPU Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 12/13] ARM: dts: omap4-panda-common: Add watchdog timers for IPU and DSP Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-09 23:19 ` [PATCH 13/13] ARM: dts: omap5-uevm: " Suman Anna 2020-07-09 23:19 ` Suman Anna 2020-07-10 16:58 ` [PATCH 00/13] Add IPU & DSP remoteprocs on OMAP4 and OMAP5 Tony Lindgren 2020-07-10 16:58 ` Tony Lindgren 2020-07-10 17:17 ` Suman Anna 2020-07-10 17:17 ` Suman Anna 2020-07-10 17:28 ` Suman Anna 2020-07-10 17:28 ` Suman Anna 2020-07-10 17:59 ` Tony Lindgren 2020-07-10 17:59 ` Tony Lindgren 2020-07-10 18:29 ` Suman Anna 2020-07-10 18:29 ` Suman Anna 2020-07-10 20:45 ` Suman Anna 2020-07-10 20:45 ` Suman Anna 2020-07-10 22:08 ` Tony Lindgren 2020-07-10 22:08 ` Tony Lindgren 2020-07-10 17:40 ` Tony Lindgren 2020-07-10 17:40 ` Tony Lindgren 2020-07-10 18:24 ` Suman Anna 2020-07-10 18:24 ` Suman Anna 2020-07-13 18:24 ` Tony Lindgren 2020-07-13 18:24 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200709231954.1973-2-s-anna@ti.com \ --to=s-anna@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=t-kristo@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.