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
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 200b303fc6c2709340996b02ae0c9a7130de7ec3 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 20 Aug 2013 12:45:51 -0300
|
|
Subject: [PATCH 174/203] ARM: mvebu: Add clock properties to Armada XP timer
|
|
node
|
|
|
|
With the addition of the Armada XP reference clock, we can now model
|
|
accurately the available clock inputs for the timer: namely, nbclk
|
|
and refclk. For each of this clock inputs we assign a name, for the
|
|
driver to select as appropriate.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Reviewed-by: Mike Turquette <mturquette@linaro.org>
|
|
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-xp.dtsi | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -70,6 +70,8 @@
|
|
|
|
timer@20300 {
|
|
compatible = "marvell,armada-xp-timer";
|
|
+ clocks = <&coreclk 2>, <&refclk>;
|
|
+ clock-names = "nbclk", "fixed";
|
|
};
|
|
|
|
coreclk: mvebu-sar@18230 {
|