diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-05-24 11:07:48 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-02 02:27:32 +0200 |
| commit | f46b563f2f270e451b2e1cee78573508cc1de256 (patch) | |
| tree | 759f3fdf59ab89f834981b0343dfc4f2ffe25654 /arch/arm/boot/dts/aspeed-g5.dtsi | |
| parent | Merge tag 'gemini-v4.13-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-f46b563f2f270e451b2e1cee78573508cc1de256.tar.xz linux-f46b563f2f270e451b2e1cee78573508cc1de256.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-g5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g5.dtsi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index a0bea4a6ec77..9cffe347b828 100644 --- 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"; }; |