From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 16:22:21 +0000 (+0200)
Subject: Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.16-rc1~43^2~4^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=597537730bfc24f61189bac197884d50e1e42248;p=linux.git

Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into depends/dma-ranges

DT support for 'dma-ranges'and 'dma-coherent' properties with ARM updates

- The 'dma-ranges' helps to take care of few DMAable system memory
        restrictions by use of dma_pfn_offset which is maintained per
        device. Arch code then uses it for dma address translations for such
        cases. We update the dma_pfn_offset accordingly during DT the device
        creation process.
- The 'dma-coherent' property is used to setup arch's coherent dma_ops.

* tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dma: use phys_addr_t in __dma_page_[cpu_to_dev/dev_to_cpu]
  ARM: dma: implement set_arch_dma_coherent_ops()
  ARM: dma: Use dma_pfn_offset for dma address translation
  of: configure the platform device dma parameters
  of: introduce of_dma_is_coherent() helper
  of: introduce of_dma_get_range() helper
  device: introduce per device dma_pfn_offset

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

597537730bfc24f61189bac197884d50e1e42248