From 662b0836a667158284c8a4a091de745fd5637ff1 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 19 Feb 2010 14:07:37 +0800 Subject: [PATCH] [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress 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 Signed-off-by: Eric Miao --- arch/arm/mach-pxa/include/mach/uncompress.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 4888a21..5ef91d9 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h @@ -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; + } } /* -- 2.7.4