mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

ARM: mvebu: Fix the Armada 370/XP timer compatible strings

Browse source 
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>
This commit is contained in:
Ezequiel Garcia 2013-08-13 11:43:15 -03:00 committed by Jason Cooper
parent 3d0ed759ea
commit 5d3b883071
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/armada-370-xp.dtsi
View file

@ -81,10 +81,8 @@ serial@12100 {
};
timer@20300 {
compatible = "marvell,armada-370-xp-timer";
reg = <0x20300 0x30>, <0x21040 0x30>;
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
clocks = <&coreclk 2>;
};
sata@a0000 {

5
arch/arm/boot/dts/armada-370.dtsi
View file

@ -104,6 +104,11 @@ gpio2: gpio@18180 {
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>;

2
arch/arm/boot/dts/armada-xp.dtsi
View file

@ -62,7 +62,7 @@ serial@12300 {
};
timer@20300 {
marvell,timer-25Mhz;
compatible = "marvell,armada-xp-timer";
};
coreclk: mvebu-sar@18230 {