diff options
author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-04 10:50:33 -0400 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-19 03:16:29 -0500 |
commit | e72996b80d53b9b7616c8b68304ce4c422b4ddd1 (patch) | |
tree | 41711d22be4aba7a41da591521c29b5fa8eb4a42 | |
parent | 1a9cd8f36d0617630b4f0ae2601fe5600edff109 (diff) |
ARM: dts: armada-370-xp: move the cpurst node in the common file
The cpurst nodes are identical in armada-370.dtsi and armada-xp.dtsi
files, so move it in the common armada-370-xp.dtsi file.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 3ccedc9dffb2..1d8171380fa0 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -228,6 +228,11 @@ | |||
228 | reg = <0x20300 0x34>, <0x20704 0x4>; | 228 | reg = <0x20300 0x34>, <0x20704 0x4>; |
229 | }; | 229 | }; |
230 | 230 | ||
231 | cpurst@20800 { | ||
232 | compatible = "marvell,armada-370-cpu-reset"; | ||
233 | reg = <0x20800 0x8>; | ||
234 | }; | ||
235 | |||
231 | pmsu@22000 { | 236 | pmsu@22000 { |
232 | compatible = "marvell,armada-370-pmsu"; | 237 | compatible = "marvell,armada-370-pmsu"; |
233 | reg = <0x22000 0x1000>; | 238 | reg = <0x22000 0x1000>; |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index b4258105e91f..79b5463209aa 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -233,11 +233,6 @@ | |||
233 | clocks = <&coreclk 2>; | 233 | clocks = <&coreclk 2>; |
234 | }; | 234 | }; |
235 | 235 | ||
236 | cpurst@20800 { | ||
237 | compatible = "marvell,armada-370-cpu-reset"; | ||
238 | reg = <0x20800 0x8>; | ||
239 | }; | ||
240 | |||
241 | cpu-config@21000 { | 236 | cpu-config@21000 { |
242 | compatible = "marvell,armada-370-cpu-config"; | 237 | compatible = "marvell,armada-370-cpu-config"; |
243 | reg = <0x21000 0x8>; | 238 | reg = <0x21000 0x8>; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 4a5f99e65b51..e141de2a4a1c 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -167,7 +167,6 @@ | |||
167 | }; | 167 | }; |
168 | 168 | ||
169 | cpurst@20800 { | 169 | cpurst@20800 { |
170 | compatible = "marvell,armada-370-cpu-reset"; | ||
171 | reg = <0x20800 0x20>; | 170 | reg = <0x20800 0x20>; |
172 | }; | 171 | }; |
173 | 172 | ||