Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46b563f authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

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: default avatarJoel Stanley <joel@jms.id.au>
Tested-by: default avatarJonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent b90b24f5

arch/arm/boot/dts/aspeed-g4.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/aspeed-g5.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -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";

			};

arch/arm/boot/dts/moxart.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -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 {