clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings (454a65f4) · Commits · 戴 / test

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>

Documentation/devicetree/bindings/timer/faraday,fttmr010.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		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>;
		};

Admin message