summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-21 20:02:46 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-21 20:02:46 +0000
commit32d6448a08bdbe6d22fcff1dfffb8399003282df (patch)
tree6e41aeca1077b430f2fc82b43463c68bec6478c4 /arch/arm/boot
parent86b7d3f7797908914735da83eb30df9d81fbd50a (diff)
parente60304f8cb7bb545e79fe62d9b9762460c254ec2 (diff)
downloadop-kernel-dev-32d6448a08bdbe6d22fcff1dfffb8399003282df.zip
op-kernel-dev-32d6448a08bdbe6d22fcff1dfffb8399003282df.tar.gz
Merge tag 'marvell-hwiocc-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Add hardware I/O coherency support for Armada 370/XP The purpose of this patch set is to add hardware I/O Coherency support for Armada 370 and Armada XP. Theses SoCs come with an unit called coherency fabric. A beginning of the support for this unit have been introduced with the SMP patch set. This series extend this support: the coherency fabric unit allows to use the Armada XP and the Armada 370 as nearly coherent architectures. The third patches enables this new feature and register our own set of DMA ops, to benefit this hardware enhancement. The first patches exports a dma operation function needed to register our own set of dma ops. The second patch introduces a new flag for the address decoding configuration in order to be able to set the memory windows as shared memory.
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index af7d16e..9f43d0e 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -38,7 +38,8 @@
coherency-fabric@d0020200 {
compatible = "marvell,coherency-fabric";
- reg = <0xd0020200 0xb0>;
+ reg = <0xd0020200 0xb0>,
+ <0xd0021810 0x1c>;
};
soc {
OpenPOWER on IntegriCloud