Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca41cc96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 

Pull CMA and DMA-mapping updates from Marek Szyprowski:
 "This time the pull request is rather small, because the further
  redesign patches were not ready on time.

  This pull request consists of the patches which extend ARM DMA-mapping
  subsystem with support for CPU coherent (ACP) DMA busses.  The first
  client of the new version is HighBank SATA driver.  The second part of
  the pull request includes various cleanup for both CMA common code and
  ARM DMA-mapping subsystem."

Fix up trivial add-add conflict due to the "dma-coherent" DT property
being added next to the "calxeda,port-phys" property for the Calxeda
AHCI controller.

* 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
  ARM: highbank: add coherent DMA setup
  ARM: kill off arch_is_coherent
  ARM: add coherent iommu dma ops
  ARM: add coherent dma ops
  ARM: dma-mapping: Refrain noisy console message
  ARM: dma-mapping: Small logical clean up
  drivers: dma-contiguous: refactor dma_alloc_from_contiguous()
parents 3151367f 461b6f0d

Documentation/devicetree/bindings/ata/ahci-platform.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ Optional properties: 
- calxeda,port-phys: phandle-combophy and lane assignment, which maps each

- calxeda,port-phys: phandle-combophy and lane assignment, which maps each

			SATA port to a combophy and a lane within that

			SATA port to a combophy and a lane within that

			combophy

			combophy

- dma-coherent      : Present if dma operations are coherent





Example:

Example:

        sata@ffe08000 {

        sata@ffe08000 {

Documentation/devicetree/bindings/dma/arm-pl330.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,9 @@ Required properties: 
    region.

    region.

  - interrupts: interrupt number to the cpu.

  - interrupts: interrupt number to the cpu.





Optional properties:

- dma-coherent      : Present if dma operations are coherent



Example:

Example:





	pdma0: pdma@12680000 {

	pdma0: pdma@12680000 {

Documentation/devicetree/bindings/net/calxeda-xgmac.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,9 @@ Required properties: 
- interrupts : Should contain 3 xgmac interrupts. The 1st is main interrupt.

- interrupts : Should contain 3 xgmac interrupts. The 1st is main interrupt.

  The 2nd is pwr mgt interrupt. The 3rd is low power state interrupt.

  The 2nd is pwr mgt interrupt. The 3rd is low power state interrupt.





Optional properties:

- dma-coherent      : Present if dma operations are coherent



Example:

Example:





ethernet@fff50000 {

ethernet@fff50000 {

arch/arm/boot/dts/highbank.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -124,6 +124,7 @@ 
			calxeda,port-phys = <&combophy5 0 &combophy0 0

			calxeda,port-phys = <&combophy5 0 &combophy0 0

					     &combophy0 1 &combophy0 2

					     &combophy0 1 &combophy0 2

					     &combophy0 3>;

					     &combophy0 3>;

			dma-coherent;

		};

		};





		sdhci@ffe0e000 {

		sdhci@ffe0e000 {

arch/arm/include/asm/barrier.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -44,10 +44,9 @@ 
#define rmb()		dsb()

#define rmb()		dsb()

#define wmb()		mb()

#define wmb()		mb()

#else

#else

#include <asm/memory.h>

#define mb()		barrier()

#define mb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define rmb()		barrier()

#define rmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define wmb()		barrier()

#define wmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#endif

#endif





#ifndef CONFIG_SMP

#ifndef CONFIG_SMP