* [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks
@ 2018-11-16 20:42 Martin Blumenstingl
2018-11-16 20:42 ` [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts Martin Blumenstingl
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Martin Blumenstingl @ 2018-11-16 20:42 UTC (permalink / raw)
To: linus-amlogic
This is a follow-up of my series "meson6_timer: dt-bindings updates"
from [0].
We were missing the interrupts for timer B, C and D. This is harmless
so far because the meson6_timer driver only implements timer A. Timer
E doesn't have any interrupt.
Additionally the timer IP block has two clock inputs. This also adds
them.
NOTE: the alias "timer_abcde" was chosen because there's a second
timer instance (F..I which are similar to A..D and J which is
similar to E).
[0] https://patchwork.kernel.org/cover/10658573/
Martin Blumenstingl (2):
ARM: dts: meson: add the TIMER B/C/D interrupts
ARM: dts: meson: add the clock inputs for the Meson timer
arch/arm/boot/dts/meson.dtsi | 7 +++++--
arch/arm/boot/dts/meson6.dtsi | 5 +++++
arch/arm/boot/dts/meson8.dtsi | 5 +++++
arch/arm/boot/dts/meson8b.dtsi | 5 +++++
4 files changed, 20 insertions(+), 2 deletions(-)
--
2.19.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts 2018-11-16 20:42 [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Martin Blumenstingl @ 2018-11-16 20:42 ` Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 2/2] ARM: dts: meson: add the clock inputs for the Meson timer Martin Blumenstingl 2018-11-29 0:49 ` [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Martin Blumenstingl @ 2018-11-16 20:42 UTC (permalink / raw) To: linus-amlogic The timer on Meson6/Meson8/Meson8b SoCs has four internal timer events. For each of these a separate interrupt exists. Pass these interrupts to allow using the timers other than TIMER A. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 0d9faf1a51ea..f0255450bcb2 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -200,7 +200,10 @@ timer at 9940 { compatible = "amlogic,meson6-timer"; reg = <0x9940 0x18>; - interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>; }; }; -- 2.19.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: meson: add the clock inputs for the Meson timer 2018-11-16 20:42 [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts Martin Blumenstingl @ 2018-11-16 20:42 ` Martin Blumenstingl 2018-11-29 0:49 ` [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Martin Blumenstingl @ 2018-11-16 20:42 UTC (permalink / raw) To: linus-amlogic The Meson Timer IP block has two clock inputs: - clk81 for using the system clock as timebase - xtal for a timebase with 1us, 10us, 100us and 1ms resolution The clocksource driver does not use these yet, but it's still a good idea to add them as this describes how the hardware actually works internally. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson.dtsi | 2 +- arch/arm/boot/dts/meson6.dtsi | 5 +++++ arch/arm/boot/dts/meson8.dtsi | 5 +++++ arch/arm/boot/dts/meson8b.dtsi | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index f0255450bcb2..0839da07a75c 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -197,7 +197,7 @@ interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; - timer at 9940 { + timer_abcde: timer at 9940 { compatible = "amlogic,meson6-timer"; reg = <0x9940 0x18>; interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>, diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi index 9b463211339f..ca978ab952cd 100644 --- a/arch/arm/boot/dts/meson6.dtsi +++ b/arch/arm/boot/dts/meson6.dtsi @@ -88,6 +88,11 @@ status = "disabled"; }; +&timer_abcde { + clocks = <&xtal>, <&clk81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { clocks = <&xtal>, <&clk81>, <&clk81>; clock-names = "xtal", "pclk", "baud"; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 08c54cf5420a..3be5fbd07997 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -387,6 +387,11 @@ clocks = <&clkc CLKID_CLK81>; }; +&timer_abcde { + clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 46b3564a6536..587a855f872b 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -370,6 +370,11 @@ clock-names = "core", "clkin"; }; +&timer_abcde { + clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; -- 2.19.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks 2018-11-16 20:42 [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 2/2] ARM: dts: meson: add the clock inputs for the Meson timer Martin Blumenstingl @ 2018-11-29 0:49 ` Kevin Hilman 2 siblings, 0 replies; 4+ messages in thread From: Kevin Hilman @ 2018-11-29 0:49 UTC (permalink / raw) To: linus-amlogic Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > This is a follow-up of my series "meson6_timer: dt-bindings updates" > from [0]. > We were missing the interrupts for timer B, C and D. This is harmless > so far because the meson6_timer driver only implements timer A. Timer > E doesn't have any interrupt. > > Additionally the timer IP block has two clock inputs. This also adds > them. > > NOTE: the alias "timer_abcde" was chosen because there's a second > timer instance (F..I which are similar to A..D and J which is > similar to E). Queued for v4.21 (branch: v4.21/dt) Kevin ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-29 0:49 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-11-16 20:42 [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts Martin Blumenstingl 2018-11-16 20:42 ` [PATCH 2/2] ARM: dts: meson: add the clock inputs for the Meson timer Martin Blumenstingl 2018-11-29 0:49 ` [PATCH 0/2] ARM: dts: meson: add the timer interrupts and clocks Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox