diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-08-27 17:24:20 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-12-01 17:50:45 +0100 |
| commit | 97890ba9289c66e23f2f2d431937693b6498d6f6 (patch) | |
| tree | fce6fcfd86ad149adfdae5c04245cc75342d2608 /arch/arm | |
| parent | iommu: fix initialization without 'add_device' callback (diff) | |
| download | linux-97890ba9289c66e23f2f2d431937693b6498d6f6.tar.xz linux-97890ba9289c66e23f2f2d431937693b6498d6f6.zip | |
dma-mapping: detect and configure IOMMU in of_dma_configure
This patch extends of_dma_configure so that it sets up the IOMMU for a
device, as well as the coherent/non-coherent DMA mapping ops.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index dc3420e77758..f3c0d953f6a2 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -121,7 +121,9 @@ static inline unsigned long dma_max_pfn(struct device *dev) } #define dma_max_pfn(dev) dma_max_pfn(dev) -static inline void arch_setup_dma_ops(struct device *dev, bool coherent) +static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, + u64 size, struct iommu_ops *iommu, + bool coherent) { if (coherent) set_dma_ops(dev, &arm_coherent_dma_ops); |