diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 15:00:08 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 15:00:11 +0000 |
| commit | 2fc42814d8a9dd757abc7f80fbf11e9247e97d40 (patch) | |
| tree | 8216bbfc4fdf9bda4e30c04f415725dd0ef6da4f /arch/arm/plat-omap | |
| parent | c6baa1963c2a76ffdb157e8b9a5a55b30046b125 (diff) | |
| parent | 29cb8d0d249f6b8fa33683cc17622ff16ada834c (diff) | |
Merge branch 'pending-dma-streaming' (early part) into devel
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/memory.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h index 9ad41dc484c1..3325f7b49eaa 100644 --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h @@ -68,6 +68,13 @@ __dma = __dma - PHYS_OFFSET + OMAP1510_LB_OFFSET; \ __dma; }) +#define __arch_dma_to_page(dev, addr) \ + ({ dma_addr_t __dma = addr; \ + if (is_lbus_device(dev)) \ + __dma += PHYS_OFFSET - OMAP1510_LB_OFFSET; \ + phys_to_page(__dma); \ + }) + #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ lbus_to_virt(addr) : \ __phys_to_virt(addr)); }) |