9eb7115bcc
This patch takes out IO mapping macros from mach/io.h and puts them in
mach/hardware.h avoiding need to include mach/io.h in various files such as
serial.h, vmalloc.h etc.
The main reason to avoid inclusion of mach/io.h is, when default in/out macros
are overridden by machine specific functions (e.g., in case of PCI I/O), they
result into linker error. An example snippet and error snapshot is listed below.
Following code in mach/io.h:
#define inl(p) my_inl()
static inline unsigned int my_inl(unsigned int addr)
{
if (IS_PCI_IO(addr))
return pci_inl ();
else
return le32_to_cpu(__raw_readl(__typesafe_io(addr)));
}
leads to error:
LD arch/arm/boot/compressed/vmlinux
arch/arm/boot/compressed/misc.o: In function `my_inl':
misc.c:(.text+0x2744): undefined reference to `pci_inl'
make[2]: *** [arch/arm/boot/compressed/vmlinux] Error 1
This is because mach/io.h gets included in arch/arm/boot/compressed/misc.c
through mach/serial.h but pci.c file, which defines 'pci_inl' doesn't get built
into compressed vmlinux.
Signed-off-by: Hemant Pedanekar <hemantp@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
32 lines
933 B
C
32 lines
933 B
C
/*
|
|
* DaVinci IO address definitions
|
|
*
|
|
* Copied from include/asm/arm/arch-omap/io.h
|
|
*
|
|
* 2007 (c) MontaVista Software, Inc. This file is licensed under
|
|
* the terms of the GNU General Public License version 2. This program
|
|
* is licensed "as is" without any warranty of any kind, whether express
|
|
* or implied.
|
|
*/
|
|
#ifndef __ASM_ARCH_IO_H
|
|
#define __ASM_ARCH_IO_H
|
|
|
|
#define IO_SPACE_LIMIT 0xffffffff
|
|
|
|
/*
|
|
* We don't actually have real ISA nor PCI buses, but there is so many
|
|
* drivers out there that might just work if we fake them...
|
|
*/
|
|
#define __io(a) __typesafe_io(a)
|
|
#define __mem_pci(a) (a)
|
|
#define __mem_isa(a) (a)
|
|
|
|
#ifndef __ASSEMBLER__
|
|
#define __arch_ioremap(p, s, t) davinci_ioremap(p, s, t)
|
|
#define __arch_iounmap(v) davinci_iounmap(v)
|
|
|
|
void __iomem *davinci_ioremap(unsigned long phys, size_t size,
|
|
unsigned int type);
|
|
void davinci_iounmap(volatile void __iomem *addr);
|
|
#endif
|
|
#endif /* __ASM_ARCH_IO_H */
|