diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-08-13 16:43:15 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-16 15:02:11 +0200 |
| commit | 5d3b883071763e6448386b875f04fcb201b6e12d (patch) | |
| tree | c15e1a13401b707158cb7c270a9f300b1c86bc01 /arch/arm/boot/dts/armada-370.dtsi | |
| parent | ARM: mvebu: use dts pre-processor for readynas 102 (diff) | |
| download | linux-5d3b883071763e6448386b875f04fcb201b6e12d.tar.xz linux-5d3b883071763e6448386b875f04fcb201b6e12d.zip | |
ARM: mvebu: Fix the Armada 370/XP timer compatible strings
The "marvell,armada-370-xp-timer" compatible string, together with
the "marvell,timer-25Mhz" property are deprecated and should be
removed from current DT.
Instead, the timer DT nodes are now required to have an appropriate
compatible string, which should be either "marvell,armada-370-timer"
or "marvell,armada-xp-timer", depending on SoC.
The clock property is now required only for Armada 370 so move it accordingly.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index e8deeab34b33..472433cb4c15 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -104,6 +104,11 @@ interrupts = <91>; }; + timer@20300 { + compatible = "marvell,armada-370-timer"; + clocks = <&coreclk 2>; + }; + coreclk: mvebu-sar@18230 { compatible = "marvell,armada-370-core-clock"; reg = <0x18230 0x08>; |