From: Marc Zyngier <maz@misterjones.org>
Date: Fri, 19 Feb 2010 06:07:37 +0000 (+0800)
Subject: [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=662b0836a667158284c8a4a091de745fd5637ff1;p=deliverable%2Flinux.git

[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 <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---

diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index 4888a21947b0..5ef91d9d17e4 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;
+	}
 }
 
 /*