diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2012-11-17 15:22:25 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 14:46:49 +0100 |
| commit | 307c2bf467e3682c6df1b8186365224fd2d581d3 (patch) | |
| tree | e746efe036e9e5bf44599239f3edf5f1106d5b18 /arch/arm | |
| parent | 9d2027830c6306b079d5e888d40ec1f2efebd6ad (diff) | |
| download | blackbird-op-linux-307c2bf467e3682c6df1b8186365224fd2d581d3.tar.gz blackbird-op-linux-307c2bf467e3682c6df1b8186365224fd2d581d3.zip | |
clocksource: convert time-armada-370-xp to clk framework
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-db.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index fffd5c2a3041..4a31b0396623 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts @@ -34,9 +34,5 @@ clock-frequency = <200000000>; status = "okay"; }; - timer@d0020300 { - clock-frequency = <600000000>; - status = "okay"; - }; }; }; diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 16cc82cdaa81..94b4b9e03571 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -62,6 +62,7 @@ compatible = "marvell,armada-370-xp-timer"; reg = <0xd0020300 0x30>; interrupts = <37>, <38>, <39>, <40>; + clocks = <&coreclk 2>; }; addr-decoding@d0020000 { |
