Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d3b8830 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

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: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 3d0ed759

arch/arm/boot/dts/armada-370-xp.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -81,10 +81,8 @@ 
			};



			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 {

arch/arm/boot/dts/armada-370.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/armada-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
			};



			timer@20300 {

				marvell,timer-25Mhz;

				compatible = "marvell,armada-xp-timer";

			};



			coreclk: mvebu-sar@18230 {