diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-08-21 06:31:06 -0400 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-10-02 02:58:07 -0400 |
commit | 1dc737c44a11c66f23ebeb09796f52f4b60d59c7 (patch) | |
tree | 35d2020f28bdd4c406eaf2e6909c648ce12a66e5 /Documentation | |
parent | 48aa820f1e3824e46dde6251db98e5961abf605d (diff) |
ARM: highbank: add coherent DMA setup
Some highbank DMA masters can support coherent (ACP) or non-coherent DMA.
This sets up dma_map_ops for masters which are configured for coherent DMA.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/ata/ahci-platform.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/dma/arm-pl330.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/net/calxeda-xgmac.txt | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index 8bb8a76d42e8..6c1ad01d27e8 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt | |||
@@ -8,6 +8,9 @@ Required properties: | |||
8 | - interrupts : <interrupt mapping for SATA IRQ> | 8 | - interrupts : <interrupt mapping for SATA IRQ> |
9 | - reg : <registers mapping> | 9 | - reg : <registers mapping> |
10 | 10 | ||
11 | Optional properties: | ||
12 | - dma-coherent : Present if dma operations are coherent | ||
13 | |||
11 | Example: | 14 | Example: |
12 | sata@ffe08000 { | 15 | sata@ffe08000 { |
13 | compatible = "calxeda,hb-ahci"; | 16 | compatible = "calxeda,hb-ahci"; |
diff --git a/Documentation/devicetree/bindings/dma/arm-pl330.txt b/Documentation/devicetree/bindings/dma/arm-pl330.txt index a4cd273b2a67..36e27d54260b 100644 --- a/Documentation/devicetree/bindings/dma/arm-pl330.txt +++ b/Documentation/devicetree/bindings/dma/arm-pl330.txt | |||
@@ -9,6 +9,9 @@ Required properties: | |||
9 | region. | 9 | region. |
10 | - interrupts: interrupt number to the cpu. | 10 | - interrupts: interrupt number to the cpu. |
11 | 11 | ||
12 | Optional properties: | ||
13 | - dma-coherent : Present if dma operations are coherent | ||
14 | |||
12 | Example: | 15 | Example: |
13 | 16 | ||
14 | pdma0: pdma@12680000 { | 17 | pdma0: pdma@12680000 { |
diff --git a/Documentation/devicetree/bindings/net/calxeda-xgmac.txt b/Documentation/devicetree/bindings/net/calxeda-xgmac.txt index 411727a3f82d..c8ae996bd8f2 100644 --- a/Documentation/devicetree/bindings/net/calxeda-xgmac.txt +++ b/Documentation/devicetree/bindings/net/calxeda-xgmac.txt | |||
@@ -6,6 +6,9 @@ Required properties: | |||
6 | - interrupts : Should contain 3 xgmac interrupts. The 1st is main interrupt. | 6 | - interrupts : Should contain 3 xgmac interrupts. The 1st is main interrupt. |
7 | The 2nd is pwr mgt interrupt. The 3rd is low power state interrupt. | 7 | The 2nd is pwr mgt interrupt. The 3rd is low power state interrupt. |
8 | 8 | ||
9 | Optional properties: | ||
10 | - dma-coherent : Present if dma operations are coherent | ||
11 | |||
9 | Example: | 12 | Example: |
10 | 13 | ||
11 | ethernet@fff50000 { | 14 | ethernet@fff50000 { |