diff options
author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2012-11-17 09:22:25 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 08:46:49 -0500 |
commit | 307c2bf467e3682c6df1b8186365224fd2d581d3 (patch) | |
tree | e746efe036e9e5bf44599239f3edf5f1106d5b18 /arch | |
parent | 9d2027830c6306b079d5e888d40ec1f2efebd6ad (diff) |
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')
-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 @@ | |||
34 | clock-frequency = <200000000>; | 34 | clock-frequency = <200000000>; |
35 | status = "okay"; | 35 | status = "okay"; |
36 | }; | 36 | }; |
37 | timer@d0020300 { | ||
38 | clock-frequency = <600000000>; | ||
39 | status = "okay"; | ||
40 | }; | ||
41 | }; | 37 | }; |
42 | }; | 38 | }; |
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 @@ | |||
62 | compatible = "marvell,armada-370-xp-timer"; | 62 | compatible = "marvell,armada-370-xp-timer"; |
63 | reg = <0xd0020300 0x30>; | 63 | reg = <0xd0020300 0x30>; |
64 | interrupts = <37>, <38>, <39>, <40>; | 64 | interrupts = <37>, <38>, <39>, <40>; |
65 | clocks = <&coreclk 2>; | ||
65 | }; | 66 | }; |
66 | 67 | ||
67 | addr-decoding@d0020000 { | 68 | addr-decoding@d0020000 { |