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 <joel@jms.id.au>
Tested-by: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 8c6bc29eb7f695e0c43a1e6a242c20ea11ea177e..8a04c7e2d8185c9a72ea7824785ac93009672561 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -886,13 +886,12 @@
                        };
 
                        timer: timer@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@1e785000 {

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index a0bea4a6ec7764141e1a62cb8716a1cba5ad6e2e..9cffe347b828a7fd3b85b85e01c0b0fcda65a464 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -993,13 +993,12 @@
                        };
 
                        timer: timer@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";
                        };
 
 

diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi
index e86f8c905ac57ba1bb01af25ca98e785b640b4b6..1f4c795d3f7210223d7cdab4b5e430affa133a35 100644 (file)
--- a/arch/arm/boot/dts/moxart.dtsi
+++ b/arch/arm/boot/dts/moxart.dtsi
@@ -58,10 +58,11 @@
                };
 
                timer: timer@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@98700000 {