c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From d569707433b26bb70f6b595a480bcfb3043a614c Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 20 Aug 2013 12:45:54 -0300
|
|
Subject: [PATCH 194/203] clocksource: armada-370-xp: Add detailed clock
|
|
requirements in devicetree binding
|
|
|
|
Specifies the required clock inputs for each supported compatible.
|
|
Armada 370 requires a single clock phandle, and Armada XP requires
|
|
two clock phandles with clock-names "nbclk" and "fixed".
|
|
|
|
Cc: devicetree@vger.kernel.org
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Acked-by: Jason Cooper <jason@lakedaemon.net>
|
|
Acked-by: Stephen Warren <swarren@nvidia.com>
|
|
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
---
|
|
.../bindings/timer/marvell,armada-370-xp-timer.txt | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
|
|
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
|
|
@@ -9,8 +9,15 @@ Required properties:
|
|
- 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, only required for
|
|
- "marvell,armada-370-timer";
|
|
+
|
|
+Clocks required for compatible = "marvell,armada-370-timer":
|
|
+- clocks : Must contain a single entry describing the clock input
|
|
+
|
|
+Clocks required for compatible = "marvell,armada-xp-timer":
|
|
+- clocks : Must contain an entry for each entry in clock-names.
|
|
+- clock-names : Must include the following entries:
|
|
+ "nbclk" (L2/coherency fabric clock),
|
|
+ "fixed" (Reference 25 MHz fixed-clock).
|
|
|
|
Examples:
|
|
|
|
@@ -29,4 +36,6 @@ Examples:
|
|
compatible = "marvell,armada-xp-timer";
|
|
reg = <0x20300 0x30>, <0x21040 0x30>;
|
|
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
|
|
+ clocks = <&coreclk 2>, <&refclk>;
|
|
+ clock-names = "nbclk", "fixed";
|
|
};
|