Skip to contentSkip to conversation

ARM: dts: augment Moxa and Aspeed DTS for FTTMR010

PATCH New Linus Walleij 2 participants 2 messages May 24, 2017 – Jun 2, 2017

Subsystems (2)
Device tree bindings Arm/Aspeed machine support
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 1/1 ARM: dts: augment Moxa and Aspeed DTS for FTTMR010

This augments the Moxa Art and Aspeed device trees to:

- Explicitly name the clock "PCLK" as the Faraday FTTMR010 names it.
- List the Moxa timer as compatible with the Faradat FTTMR010 vanilla version.
- Add a comment that the Aspeed driver is a Faraday FTTMR010 derivative.
- Pass all IRQs to the timer from Aspeed: they are all there so they should be in the device tree, we only use the first one anyways.

Tested-by Joel Stanley <[email protected]>
Tested-by Jonas Jensen <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

---
ARM SoC maintainers: this is the DTS changes needt to generalize the Faraday timer. Please merge this into some suitable ARM SoC DTS branch.
Clocksource maintainers: I will ask the ARM SoC people to merge this patch orthogonally, it is only included in this series for reference and for testing.

---
 arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++----
 arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++----
 arch/arm/boot/dts/moxart.dtsi    | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)
arch/arm/boot/dts/aspeed-g4.dtsi +3 -4
index 8c6bc29eb7f6..8a04c7e2d818 100644
@@ -886,13 +886,12 @@
 			};
 
 			timer: timer at 1e782000 {
+				/* This timer is a Faraday FTTMR010 derivative */
 				compatible = "aspeed,ast2400-timer";
 				reg = <0x1e782000 0x90>;
-				// The moxart_timer driver registers only one
-				// interrupt and assumes it's for timer 1
-				//interrupts = <16 17 18 35 36 37 38 39>;
-				interrupts = <16>;
+				interrupts = <16 17 18 35 36 37 38 39>;
 				clocks = <&clk_apb>;
+				clock-names = "PCLK";
 			};
 
 			wdt1: wdt at 1e785000 {
arch/arm/boot/dts/aspeed-g5.dtsi +3 -4
index a0bea4a6ec77..9cffe347b828 100644
@@ -993,13 +993,12 @@
 			};
 
 			timer: timer at 1e782000 {
+				/* This timer is a Faraday FTTMR010 derivative */
 				compatible = "aspeed,ast2400-timer";
 				reg = <0x1e782000 0x90>;
-				// The moxart_timer driver registers only one
-				// interrupt and assumes it's for timer 1
-				//interrupts = <16 17 18 35 36 37 38 39>;
-				interrupts = <16>;
+				interrupts = <16 17 18 35 36 37 38 39>;
 				clocks = <&clk_apb>;
+				clock-names = "PCLK";
 			};
arch/arm/boot/dts/moxart.dtsi +2 -1
index e86f8c905ac5..1f4c795d3f72 100644
@@ -58,10 +58,11 @@
 		};
 
 		timer: timer at 98400000 {
-			compatible = "moxa,moxart-timer";
+			compatible = "moxa,moxart-timer", "faraday,fttmr010";
 			reg = <0x98400000 0x42>;
 			interrupts = <19 IRQ_TYPE_EDGE_FALLING>;
 			clocks = <&clk_apb>;
+			clock-names = "PCLK";
 		};
 
 		gpio: gpio at 98700000 {
Signature · 1 line
2.9.4
Applied
#1 lore raw

PATCH 1/1 ARM: dts: augment Moxa and Aspeed DTS for FTTMR010

Quoted 15 lines · Linus Walleij

This augments the Moxa Art and Aspeed device trees to:

- Explicitly name the clock "PCLK" as the Faraday FTTMR010 names it.
- List the Moxa timer as compatible with the Faradat FTTMR010 vanilla version.
- Add a comment that the Aspeed driver is a Faraday FTTMR010 derivative.
- Pass all IRQs to the timer from Aspeed: they are all there so they should be in the device tree, we only use the first one anyways.

Tested-by Joel Stanley <[email protected]>
Tested-by Jonas Jensen <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
Quoted 7 lines

---
ARM SoC maintainers: this is the DTS changes needt to generalize the Faraday timer. Please merge this into some suitable ARM SoC DTS branch.
Clocksource maintainers: I will ask the ARM SoC people to merge this patch orthogonally, it is only included in this series for reference and for testing.

Merged into next/dt for v4.13. Thanks!

-Olof