diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-22 18:11:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-23 12:30:52 +0100 |
| commit | 6b74f61a471ad0f3a5e919e314d4f60cd3966f5e (patch) | |
| tree | 9ab2c2ea8a78c499f1ce755737e5dc5003ca2a07 /arch/arm/mm | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| parent | 2161c2485d03520060f6094359b22f33913eefa2 (diff) | |
| download | linux-stable-6b74f61a471ad0f3a5e919e314d4f60cd3966f5e.tar.gz linux-stable-6b74f61a471ad0f3a5e919e314d4f60cd3966f5e.tar.bz2 linux-stable-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 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b00be1f971e..18e98dfb73fc 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -885,7 +885,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, static void __dma_page_cpu_to_dev(struct page *page, unsigned long off, size_t size, enum dma_data_direction dir) { - unsigned long paddr; + phys_addr_t paddr; dma_cache_maint_page(page, off, size, dir, dmac_map_area); @@ -901,7 +901,7 @@ static void __dma_page_cpu_to_dev(struct page *page, unsigned long off, static void __dma_page_dev_to_cpu(struct page *page, unsigned long off, size_t size, enum dma_data_direction dir) { - unsigned long paddr = page_to_phys(page) + off; + phys_addr_t paddr = page_to_phys(page) + off; /* FIXME: non-speculating: not required */ /* don't bother invalidating if DMA to device */ |