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()

diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 147c1f6653fe78c3ee442290d38f4f436c670fb4,6c1ad01d27e8369f4716dc2f245ef49d5c8be42d..b519f9b699c30eec22d99b7398691b3b80c4c7a3
--- 1/Documentation/devicetree/bindings/ata/ahci-platform.txt
--- 2/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -9,9 -9,7 +9,10 @@@ Required properties
  - reg               : <registers mapping>
  
  Optional properties:
 +- calxeda,port-phys: phandle-combophy and lane assignment, which maps each
 +                      SATA port to a combophy and a lane within that
 +                      combophy
+ - dma-coherent      : Present if dma operations are coherent
  
  Example:
          sata@ffe08000 {

diff --cc arch/arm/boot/dts/highbank.dts
index 5204cf73c2d81540459b4442fd675d596c8789e5,7414577c177fce867038a717b29cb3c3ea3545fe..0c6fc34821f93f336fd705626c35da8b9cbba9f3
--- 1/arch/arm/boot/dts/highbank.dts
--- 2/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@@ -121,9 -121,7 +121,10 @@@
                        compatible = "calxeda,hb-ahci";
                        reg = <0xffe08000 0x10000>;
                        interrupts = <0 83 4>;
 +                      calxeda,port-phys = <&combophy5 0 &combophy0 0
 +                                           &combophy0 1 &combophy0 2
 +                                           &combophy0 3>;
+                       dma-coherent;
                };
  
                sdhci@ffe0e000 {

diff --cc arch/arm/mach-highbank/highbank.c
index af1da34ccf9d46e205e8c6e2dd8ff6fa61af8d1f,93617d61f4b1fbd44043257fcdf8474577a34b97..40e36a50304c9bdb8994fc0e9ac91b5c06a44578
--- 1/arch/arm/mach-highbank/highbank.c
--- 2/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -152,8 -201,10 +201,11 @@@ static struct notifier_block highbank_p
  static void __init highbank_init(void)
  {
        pm_power_off = highbank_power_off;
 +      highbank_pm_init();
  
+       bus_register_notifier(&platform_bus_type, &highbank_platform_nb);
+       bus_register_notifier(&amba_bustype, &highbank_amba_nb);
+ 
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  

diff --cc arch/arm/mm/mmu.c
Simple merge