diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
| commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
| tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/plat-omap/include/mach/serial.h | |
| parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
| parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) | |
| download | op-kernel-dev-cd07ecc828486e5887113c7dc4d9f9022145811b.zip op-kernel-dev-cd07ecc828486e5887113c7dc4d9f9022145811b.tar.gz | |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/plat-omap/include/mach/serial.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/serial.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index 8e89585..13abd02 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h @@ -1,5 +1,8 @@ /* - * arch/arm/plat-omap/include/mach/serial.h + * arch/arm/plat-omap/include/mach/serial.h + * + * Copyright (C) 2009 Texas Instruments + * Addded OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com> * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,19 +18,28 @@ #define OMAP_UART1_BASE 0xfffb0000 #define OMAP_UART2_BASE 0xfffb0800 #define OMAP_UART3_BASE 0xfffb9800 +#define OMAP_MAX_NR_PORTS 3 #elif defined(CONFIG_ARCH_OMAP2) /* OMAP2 serial ports */ #define OMAP_UART1_BASE 0x4806a000 #define OMAP_UART2_BASE 0x4806c000 #define OMAP_UART3_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 3 #elif defined(CONFIG_ARCH_OMAP3) /* OMAP3 serial ports */ #define OMAP_UART1_BASE 0x4806a000 #define OMAP_UART2_BASE 0x4806c000 #define OMAP_UART3_BASE 0x49020000 +#define OMAP_MAX_NR_PORTS 3 +#elif defined(CONFIG_ARCH_OMAP4) +/* OMAP4 serial ports */ +#define OMAP_UART1_BASE 0x4806a000 +#define OMAP_UART2_BASE 0x4806c000 +#define OMAP_UART3_BASE 0x48020000 +#define OMAP_UART4_BASE 0x4806e000 +#define OMAP_MAX_NR_PORTS 4 #endif -#define OMAP_MAX_NR_PORTS 3 #define OMAP1510_BASE_BAUD (12000000/16) #define OMAP16XX_BASE_BAUD (48000000/16) #define OMAP24XX_BASE_BAUD (48000000/16) |
