diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-04 15:50:33 +0100 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-19 09:16:29 +0100 |
| commit | e72996b80d53b9b7616c8b68304ce4c422b4ddd1 (patch) | |
| tree | 41711d22be4aba7a41da591521c29b5fa8eb4a42 /arch/arm/boot/dts | |
| parent | ARM: dts: armada-xp-matrix: Fix the location of the pcie-controller node (diff) | |
| download | linux-e72996b80d53b9b7616c8b68304ce4c422b4ddd1.tar.xz linux-e72996b80d53b9b7616c8b68304ce4c422b4ddd1.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -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 @@ reg = <0x20300 0x34>, <0x20704 0x4>; }; + cpurst@20800 { + compatible = "marvell,armada-370-cpu-reset"; + reg = <0x20800 0x8>; + }; + pmsu@22000 { compatible = "marvell,armada-370-pmsu"; 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 @@ clocks = <&coreclk 2>; }; - cpurst@20800 { - compatible = "marvell,armada-370-cpu-reset"; - reg = <0x20800 0x8>; - }; - cpu-config@21000 { compatible = "marvell,armada-370-cpu-config"; 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 @@ }; cpurst@20800 { - compatible = "marvell,armada-370-cpu-reset"; reg = <0x20800 0x20>; }; |