Skip to content

Commit

Permalink
clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings
Browse files Browse the repository at this point in the history
This merges the Moxa and FTTMR010 device tree bindings into the
Faraday binding document to avoid confusion.

The FTTMR010 is the IP block used by these SoCs, in vanilla
or modified variant.

The Aspeed variant is modified such that it is no longer fully
register-compatible with FTTMR010 so for this reason it is not
listed with two compatible strings, instead just one.

Cc: Joel Stanley <joel@jms.id.au>
Tested-by: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Linus Walleij authored and Daniel Lezcano committed Jun 12, 2017
1 parent 2a55e98 commit 454a65f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/timer/faraday,fttmr010.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ Required properties:

- compatible : Must be one of
"faraday,fttmr010"
"cortina,gemini-timer"
"cortina,gemini-timer", "faraday,fttmr010"
"moxa,moxart-timer", "faraday,fttmr010"
"aspeed,ast2400-timer"
- reg : Should contain registers location and length
- interrupts : Should contain the three timer interrupts usually with
flags for falling edge
Expand Down
19 changes: 0 additions & 19 deletions Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt

This file was deleted.

0 comments on commit 454a65f

Please sign in to comment.