Thread (3 messages) 3 messages, 1 author, 2017-06-14
STALE3308d REVIEWED: 13 (12M)

[PATCH 09/23] clocksource/drivers/fttmr010: Add AST2500 compatible string

From: Daniel Lezcano <hidden>
Date: 2017-06-14 12:41:30
Also in: lkml
Subsystem: clocksource, clockevent drivers, open firmware and flattened device tree bindings, the rest · Maintainers: Daniel Lezcano, Thomas Gleixner, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds

Also clean up space-before-tab issues in the documentation.

Signed-off-by: Andrew Jeffery <redacted>
Acked-by: Joel Stanley <joel@jms.id.au>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <redacted>
Signed-off-by: Daniel Lezcano <redacted>
---
 Documentation/devicetree/bindings/timer/faraday,fttmr010.txt | 2 ++
 drivers/clocksource/timer-fttmr010.c                         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt
index 6e18bd6..1957922 100644
--- a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt
+++ b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt
@@ -10,6 +10,8 @@ Required properties:
   "cortina,gemini-timer", "faraday,fttmr010"
   "moxa,moxart-timer", "faraday,fttmr010"
   "aspeed,ast2400-timer"
+  "aspeed,ast2500-timer"
+
 - reg : Should contain registers location and length
 - interrupts : Should contain the three timer interrupts usually with
   flags for falling edge
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index f880150..68982ad 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -358,4 +358,5 @@ static int __init fttmr010_timer_init(struct device_node *np)
 CLOCKSOURCE_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init);
 CLOCKSOURCE_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init);
 CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init);
-CLOCKSOURCE_OF_DECLARE(aspeed, "aspeed,ast2400-timer", fttmr010_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", fttmr010_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", fttmr010_timer_init);
-- 
2.7.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help