mirror of
https://github.com/torvalds/linux
synced 2024-10-27 13:48:49 +00:00
e99b32e271
With the omap1 SPARSE_IRQ changes mach/irqs.h is no longer automatically included. Turns out now we rely on ARCH_OMAP15XX including hardware.h from memory.h, so without ARCH_OMAP15XX we get build failures. As we have legacy drivers still relying on these indirect includes, let's not add more mach includes to the drivers. Those have to be removed anyways for multiplatform support. Let's fix up mach-omap1 to include soc.h where cpu_is_omap checks are done, and common.h for board-*.c files. But let's keep the indirect memory.h include for now to avoid unnecessary churn in the drivers. Signed-off-by: Tony Lindgren <tony@atomide.com>
55 lines
1.7 KiB
C
55 lines
1.7 KiB
C
/*
|
|
* arch/arm/mach-omap1/include/mach/memory.h
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_MEMORY_H
|
|
#define __ASM_ARCH_MEMORY_H
|
|
|
|
/* REVISIT: omap1 legacy drivers still rely on this */
|
|
#include <mach/soc.h>
|
|
|
|
/*
|
|
* Bus address is physical address, except for OMAP-1510 Local Bus.
|
|
* OMAP-1510 bus address is translated into a Local Bus address if the
|
|
* OMAP bus type is lbus. We do the address translation based on the
|
|
* device overriding the defaults used in the dma-mapping API.
|
|
* Note that the is_lbus_device() test is not very efficient on 1510
|
|
* because of the strncmp().
|
|
*/
|
|
#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__)
|
|
|
|
/*
|
|
* OMAP-1510 Local Bus address offset
|
|
*/
|
|
#define OMAP1510_LB_OFFSET UL(0x30000000)
|
|
|
|
#define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET)
|
|
#define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET)
|
|
#define is_lbus_device(dev) (cpu_is_omap15xx() && dev && (strncmp(dev_name(dev), "ohci", 4) == 0))
|
|
|
|
#define __arch_pfn_to_dma(dev, pfn) \
|
|
({ dma_addr_t __dma = __pfn_to_phys(pfn); \
|
|
if (is_lbus_device(dev)) \
|
|
__dma = __dma - PHYS_OFFSET + OMAP1510_LB_OFFSET; \
|
|
__dma; })
|
|
|
|
#define __arch_dma_to_pfn(dev, addr) \
|
|
({ dma_addr_t __dma = addr; \
|
|
if (is_lbus_device(dev)) \
|
|
__dma += PHYS_OFFSET - OMAP1510_LB_OFFSET; \
|
|
__phys_to_pfn(__dma); \
|
|
})
|
|
|
|
#define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \
|
|
lbus_to_virt(addr) : \
|
|
__phys_to_virt(addr)); })
|
|
|
|
#define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \
|
|
(dma_addr_t) (is_lbus_device(dev) ? \
|
|
virt_to_lbus(__addr) : \
|
|
__virt_to_phys(__addr)); })
|
|
|
|
#endif /* CONFIG_ARCH_OMAP15XX */
|
|
|
|
#endif
|