diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 90b117624abb..442c84e3c8da 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -81,10 +81,8 @@ | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | timer@20300 { | 83 | timer@20300 { |
84 | compatible = "marvell,armada-370-xp-timer"; | ||
85 | reg = <0x20300 0x30>, <0x21040 0x30>; | 84 | reg = <0x20300 0x30>, <0x21040 0x30>; |
86 | interrupts = <37>, <38>, <39>, <40>, <5>, <6>; | 85 | interrupts = <37>, <38>, <39>, <40>, <5>, <6>; |
87 | clocks = <&coreclk 2>; | ||
88 | }; | 86 | }; |
89 | 87 | ||
90 | sata@a0000 { | 88 | sata@a0000 { |
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 @@ | |||
104 | interrupts = <91>; | 104 | interrupts = <91>; |
105 | }; | 105 | }; |
106 | 106 | ||
107 | timer@20300 { | ||
108 | compatible = "marvell,armada-370-timer"; | ||
109 | clocks = <&coreclk 2>; | ||
110 | }; | ||
111 | |||
107 | coreclk: mvebu-sar@18230 { | 112 | coreclk: mvebu-sar@18230 { |
108 | compatible = "marvell,armada-370-core-clock"; | 113 | compatible = "marvell,armada-370-core-clock"; |
109 | reg = <0x18230 0x08>; | 114 | reg = <0x18230 0x08>; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 416eb9481844..549151ed6632 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -62,7 +62,7 @@ | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | timer@20300 { | 64 | timer@20300 { |
65 | marvell,timer-25Mhz; | 65 | compatible = "marvell,armada-xp-timer"; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | coreclk: mvebu-sar@18230 { | 68 | coreclk: mvebu-sar@18230 { |