diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2017-05-18 22:16:59 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-06-12 10:13:58 +0200 |
| commit | 454a65f43a33d48ea04ffaf635ef35abc3d27990 (patch) | |
| tree | 45c2aa6ba90af324da14c601688d14698da13ad2 /Documentation/devicetree/bindings/timer | |
| parent | clocksource/drivers/fttmr010: Fix the clock handling (diff) | |
| download | linux-dev-454a65f43a33d48ea04ffaf635ef35abc3d27990.tar.xz linux-dev-454a65f43a33d48ea04ffaf635ef35abc3d27990.zip | |
clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings
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>
Diffstat (limited to 'Documentation/devicetree/bindings/timer')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/faraday,fttmr010.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 19 |
2 files changed, 3 insertions, 20 deletions
diff --git a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt index b73ca6cd07f8..6e18bd662ccb 100644 --- a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt +++ b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt @@ -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 diff --git a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt deleted file mode 100644 index e207c11630af..000000000000 --- a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt +++ /dev/null @@ -1,19 +0,0 @@ -MOXA ART timer - -Required properties: - -- compatible : Must be one of: - - "moxa,moxart-timer" - - "aspeed,ast2400-timer" -- reg : Should contain registers location and length -- interrupts : Should contain the timer interrupt number -- clocks : Should contain phandle for the clock that drives the counter - -Example: - - timer: timer@98400000 { - compatible = "moxa,moxart-timer"; - reg = <0x98400000 0x42>; - interrupts = <19 1>; - clocks = <&coreclk>; - }; |