You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From ba47ab198541f6ed822b3c9691b392d83edba8b4 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 13 Aug 2013 11:43:14 -0300
|
|
Subject: [PATCH 193/203] clocksource: armada-370-xp: Fix device-tree binding
|
|
|
|
This commit fixes the DT binding for the Armada 370/XP SoC timer.
|
|
The previous "marvell,armada-370-xp-timer" compatible is removed and
|
|
two new compatible strings are introduced: "marvell,armada-xp-timer"
|
|
and "marvell,armada-370-timer".
|
|
|
|
The rationale behind this change is that the Armada 370 SoC and the
|
|
Armada XP SoC timers are not really compatible:
|
|
|
|
* Armada 370 has no 25 MHz fixed timer.
|
|
|
|
* Armada XP cannot work properly without such 25 MHz fixed timer
|
|
as doing otherwise leads to using a clocksource whose frequency
|
|
varies when doing cpufreq frequency changes.
|
|
|
|
This commit also removes the "marvell,timer-25Mhz" property, given
|
|
it's now meaningless.
|
|
|
|
Cc: devicetree@vger.kernel.org
|
|
Acked-by: Jason Cooper <jason@lakedaemon.net>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
---
|
|
.../bindings/timer/marvell,armada-370-xp-timer.txt | 27 ++++++++++++++++++----
|
|
1 file changed, 22 insertions(+), 5 deletions(-)
|
|
|
|
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
|
|
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
|
|
@@ -2,14 +2,31 @@ Marvell Armada 370 and Armada XP Timers
|
|
---------------------------------------
|
|
|
|
Required properties:
|
|
-- compatible: Should be "marvell,armada-370-xp-timer"
|
|
+- compatible: Should be either "marvell,armada-370-timer" or
|
|
+ "marvell,armada-xp-timer" as appropriate.
|
|
- interrupts: Should contain the list of Global Timer interrupts and
|
|
then local timer interrupts
|
|
- reg: Should contain location and length for timers register. First
|
|
pair for the Global Timer registers, second pair for the
|
|
local/private timers.
|
|
-- clocks: clock driving the timer hardware
|
|
+- clocks: clock driving the timer hardware, only required for
|
|
+ "marvell,armada-370-timer";
|
|
|
|
-Optional properties:
|
|
-- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
|
|
- Mhz fixed mode (available on Armada XP and not on Armada 370)
|
|
+Examples:
|
|
+
|
|
+- Armada 370:
|
|
+
|
|
+ timer {
|
|
+ compatible = "marvell,armada-370-timer";
|
|
+ reg = <0x20300 0x30>, <0x21040 0x30>;
|
|
+ interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
|
|
+ clocks = <&coreclk 2>;
|
|
+ };
|
|
+
|
|
+- Armada XP:
|
|
+
|
|
+ timer {
|
|
+ compatible = "marvell,armada-xp-timer";
|
|
+ reg = <0x20300 0x30>, <0x21040 0x30>;
|
|
+ interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
|
|
+ };
|