summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-xp.dtsi
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-22 00:01:15 +0400
committerJason Cooper <jason@lakedaemon.net>2012-11-22 00:01:15 +0400
commit86b7d3f7797908914735da83eb30df9d81fbd50a (patch)
tree267be5e3d77265ee3feaa4507401eaea0b65f1ff /arch/arm/boot/dts/armada-xp.dtsi
parent9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a (diff)
parent45f5984a8a528f7507f3ec860d297934d4449ad1 (diff)
downloadlinux-86b7d3f7797908914735da83eb30df9d81fbd50a.tar.xz
Merge tag 'marvell-armadaxp-smp-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
SMP support for Armada XP The purpose of this series is to add the SMP support for the Armada XP SoCs. Beside the SMP support itself brought by the last 3 commits, this series also adds the support for the coherency fabric unit and the power management service unit. The coherency fabric is responsible for ensuring hardware coherency between all CPUs and between CPUs and I/O masters. This unit is also available for Armada 370 and will be used in an incoming patch set for hardware I/O cache coherency. The power management service unit is responsible for powering down and waking up CPUs and other SOC units.
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 3c52e7ab1910..45a567c2e9ba 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -24,7 +24,13 @@
mpic: interrupt-controller@d0020000 {
reg = <0xd0020a00 0x1d0>,
- <0xd0021870 0x58>;
+ <0xd0021070 0x58>;
+ };
+
+ armada-370-xp-pmsu@d0022000 {
+ compatible = "marvell,armada-370-xp-pmsu";
+ reg = <0xd0022100 0x430>,
+ <0xd0020800 0x20>;
};
soc {