1 From e33103d8d4cfc513467eb30bc4faee5c91c8e6c2 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Tue, 13 Aug 2013 11:43:15 -0300
4 Subject: [PATCH 172/203] ARM: mvebu: Fix the Armada 370/XP timer compatible
7 The "marvell,armada-370-xp-timer" compatible string, together with
8 the "marvell,timer-25Mhz" property are deprecated and should be
9 removed from current DT.
11 Instead, the timer DT nodes are now required to have an appropriate
12 compatible string, which should be either "marvell,armada-370-timer"
13 or "marvell,armada-xp-timer", depending on SoC.
15 The clock property is now required only for Armada 370 so move it accordingly.
17 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
18 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
20 arch/arm/boot/dts/armada-370-xp.dtsi | 2 --
21 arch/arm/boot/dts/armada-370.dtsi | 5 +++++
22 arch/arm/boot/dts/armada-xp.dtsi | 2 +-
23 3 files changed, 6 insertions(+), 3 deletions(-)
25 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
26 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
31 - compatible = "marvell,armada-370-xp-timer";
32 reg = <0x20300 0x30>, <0x21040 0x30>;
33 interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
34 - clocks = <&coreclk 2>;
38 --- a/arch/arm/boot/dts/armada-370.dtsi
39 +++ b/arch/arm/boot/dts/armada-370.dtsi
45 + compatible = "marvell,armada-370-timer";
46 + clocks = <&coreclk 2>;
49 coreclk: mvebu-sar@18230 {
50 compatible = "marvell,armada-370-core-clock";
52 --- a/arch/arm/boot/dts/armada-xp.dtsi
53 +++ b/arch/arm/boot/dts/armada-xp.dtsi
58 - marvell,timer-25Mhz;
59 + compatible = "marvell,armada-xp-timer";
62 coreclk: mvebu-sar@18230 {