1 files changed, 66 insertions, 21 deletions

diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h
index 33796b4db17f..15a6192ad6eb 100644
--- a/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/arch/arm/mach-davinci/include/mach/uncompress.h
@@ -1,8 +1,17 @@
 /*
  * Serial port stubs for kernel decompress status messages
  *
- *  Author:     Anant Gole
- * (C) Copyright (C) 2006, Texas Instruments, Inc
+ * Initially based on:
+ * arch/arm/plat-omap/include/mach/uncompress.h
+ *
+ * Original copyrights follow.
+ *
+ * Copyright (C) 2000 RidgeRun, Inc.
+ * Author: Greg Lonnon <glonnon@ridgerun.com>
+ *
+ * Rewritten by:
+ * Author: <source@mvista.com>
+ * 2004 (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
@@ -11,30 +20,17 @@
 
 #include <linux/types.h>
 #include <linux/serial_reg.h>
-#include <mach/serial.h>
 
 #include <asm/mach-types.h>
 
-extern unsigned int __machine_arch_type;
+#include <mach/serial.h>
 
 static u32 *uart;
-
-static u32 *get_uart_base(void)
-{
-        if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM ||
-                __machine_arch_type == MACH_TYPE_DAVINCI_DA850_EVM)
-                return (u32 *)DA8XX_UART2_BASE;
-        else
-                return (u32 *)DAVINCI_UART0_BASE;
-}
+static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
 
 /* PORT_16C550A, in polled non-fifo mode */
-
 static void putc(char c)
 {
-        if (!uart)
-                uart = get_uart_base();
-
         while (!(uart[UART_LSR] & UART_LSR_THRE))
                 barrier();
         uart[UART_TX] = c;
@@ -42,12 +38,61 @@ static void putc(char c)
 
 static inline void flush(void)
 {
-        if (!uart)
-                uart = get_uart_base();
-
         while (!(uart[UART_LSR] & UART_LSR_THRE))
                 barrier();
 }
 
-#define arch_decomp_setup()
+static inline void set_uart_info(u32 phys, void * __iomem virt)
+{
+        uart = (u32 *)phys;
+        uart_info[0] = phys;
+        uart_info[1] = (u32)virt;
+}
+
+#define _DEBUG_LL_ENTRY(machine, phys, virt)                    \
+        if (machine_is_##machine()) {                           \
+                set_uart_info(phys, virt);                      \
+                break;                                          \
+        }
+
+#define DEBUG_LL_DAVINCI(machine, port)                         \
+        _DEBUG_LL_ENTRY(machine, DAVINCI_UART##port##_BASE,     \
+                        IO_ADDRESS(DAVINCI_UART##port##_BASE))
+
+#define DEBUG_LL_DA8XX(machine, port)                           \
+        _DEBUG_LL_ENTRY(machine, DA8XX_UART##port##_BASE,       \
+                        IO_ADDRESS(DA8XX_UART##port##_BASE))
+
+#define DEBUG_LL_TNETV107X(machine, port)                       \
+        _DEBUG_LL_ENTRY(machine, TNETV107X_UART##port##_BASE,   \
+                        TNETV107X_UART##port##_VIRT)
+
+static inline void __arch_decomp_setup(unsigned long arch_id)
+{
+        /*
+         * Initialize the port based on the machine ID from the bootloader.
+         * Note that we're using macros here instead of switch statement
+         * as machine_is functions are optimized out for the boards that
+         * are not selected.
+         */
+        do {
+                /* Davinci boards */
+                DEBUG_LL_DAVINCI(davinci_evm,           0);
+                DEBUG_LL_DAVINCI(sffsdr,                0);
+                DEBUG_LL_DAVINCI(neuros_osd2,           0);
+                DEBUG_LL_DAVINCI(davinci_dm355_evm,     0);
+                DEBUG_LL_DAVINCI(dm355_leopard,         0);
+                DEBUG_LL_DAVINCI(davinci_dm6467_evm,    0);
+                DEBUG_LL_DAVINCI(davinci_dm365_evm,     0);
+
+                /* DA8xx boards */
+                DEBUG_LL_DA8XX(davinci_da830_evm,       2);
+                DEBUG_LL_DA8XX(davinci_da850_evm,       2);
+
+                /* TNETV107x boards */
+                DEBUG_LL_TNETV107X(tnetv107x,           1);
+        } while (0);
+}
+
+#define arch_decomp_setup()     __arch_decomp_setup(arch_id)
 #define arch_decomp_wdog()