Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / plat-omap / include / plat / serial.h

diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h
index a1a118d052eff1ef478ce566ff0d18c0ef0d4832..2723f9166ea20f07c150170c15097d06d04794d7 100644 (file)
--- a/arch/arm/plat-omap/include/plat/serial.h
+++ b/arch/arm/plat-omap/include/plat/serial.h
@@ -27,7 +27,7 @@
  * 2. We assume printascii is called at least once before paging_init,
  *    and addruart has a chance to read OMAP_UART_INFO
  */
-#define OMAP_UART_INFO         (PHYS_OFFSET + 0x3ffc)
+#define OMAP_UART_INFO         (PLAT_PHYS_OFFSET + 0x3ffc)
 
 /* OMAP1 serial ports */
 #define OMAP1_UART1_BASE       0xfffb0000
@@ -51,6 +51,11 @@
 #define OMAP4_UART3_BASE       0x48020000
 #define OMAP4_UART4_BASE       0x4806e000
 
+/* TI816X serial ports */
+#define TI816X_UART1_BASE      0x48020000
+#define TI816X_UART2_BASE      0x48022000
+#define TI816X_UART3_BASE      0x48024000
+
 /* External port on Zoom2/3 */
 #define ZOOM_UART_BASE         0x10000000
 #define ZOOM_UART_VIRT         0xfa400000
@@ -81,6 +86,9 @@
 #define OMAP4UART2             OMAP2UART2
 #define OMAP4UART3             43
 #define OMAP4UART4             44
+#define TI816XUART1            81
+#define TI816XUART2            82
+#define TI816XUART3            83
 #define ZOOM_UART              95              /* Only on zoom2/3 */
 
 /* This is only used by 8250.c for omap1510 */