summaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-05-22 18:11:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-05-23 12:30:52 +0100
commit6b74f61a471ad0f3a5e919e314d4f60cd3966f5e (patch)
tree9ab2c2ea8a78c499f1ce755737e5dc5003ca2a07 /include/linux/device.h
parent4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff)
parent2161c2485d03520060f6094359b22f33913eefa2 (diff)
downloadlinux-6b74f61a471ad0f3a5e919e314d4f60cd3966f5e.tar.gz
linux-6b74f61a471ad0f3a5e919e314d4f60cd3966f5e.tar.bz2
linux-6b74f61a471ad0f3a5e919e314d4f60cd3966f5e.zip
Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into devel-stable
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.
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index d1d1c055b48e..460ebad15109 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -685,6 +685,7 @@ struct acpi_dev_node {
* @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
* hardware supports 64-bit addresses for consistent allocations
* such descriptors.
+ * @dma_pfn_offset: offset of DMA memory range relatively of RAM
* @dma_parms: A low level driver may set these to teach IOMMU code about
* segment limitations.
* @dma_pools: Dma pools (if dma'ble device).
@@ -750,6 +751,7 @@ struct device {
not all hardware supports
64 bit addresses for consistent
allocations such descriptors. */
+ unsigned long dma_pfn_offset;
struct device_dma_parameters *dma_parms;