[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
authorMarc Zyngier <maz@misterjones.org>
Fri, 19 Feb 2010 06:07:37 +0000 (14:07 +0800)
committerEric Miao <eric.y.miao@gmail.com>
Mon, 1 Mar 2010 23:40:58 +0000 (07:40 +0800)
Zeus console port is wired to a 8250-compatible device (pxa UARTs are
reserved to other uses). This patch allows such a configuration in the
uncompress sequence.

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
arch/arm/mach-pxa/include/mach/uncompress.h

index 4888a21..5ef91d9 100644 (file)
@@ -60,6 +60,12 @@ static inline void arch_decomp_setup(void)
            || machine_is_csb726() || machine_is_stargate2()
            || machine_is_cm_x300() || machine_is_balloon3())
                uart_base = STUART_BASE;
+
+       if (machine_is_arcom_zeus()) {
+               uart_base = 0x10000000; /* nCS4 */
+               uart_shift = 1;
+               uart_is_pxa = 0;
+       }
 }
 
 /*