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>
37 lines
1.1 KiB
C
37 lines
1.1 KiB
C
/*
|
|
* DaVinci serial device definitions
|
|
*
|
|
* Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
|
|
*
|
|
* 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_SERIAL_H
|
|
#define __ASM_ARCH_SERIAL_H
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
#define DAVINCI_MAX_NR_UARTS 3
|
|
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
|
|
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
|
|
#define DAVINCI_UART2_BASE (IO_PHYS + 0x20800)
|
|
|
|
#define DA8XX_UART0_BASE (IO_PHYS + 0x042000)
|
|
#define DA8XX_UART1_BASE (IO_PHYS + 0x10c000)
|
|
#define DA8XX_UART2_BASE (IO_PHYS + 0x10d000)
|
|
|
|
/* DaVinci UART register offsets */
|
|
#define UART_DAVINCI_PWREMU 0x0c
|
|
#define UART_DM646X_SCR 0x10
|
|
#define UART_DM646X_SCR_TX_WATERMARK 0x08
|
|
|
|
struct davinci_uart_config {
|
|
/* Bit field of UARTs present; bit 0 --> UART1 */
|
|
unsigned int enabled_uarts;
|
|
};
|
|
|
|
extern int davinci_serial_init(struct davinci_uart_config *);
|
|
|
|
#endif /* __ASM_ARCH_SERIAL_H */
|