diff options
author | Marc Zyngier <maz@misterjones.org> | 2010-02-19 01:07:37 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-03-01 18:40:58 -0500 |
commit | 662b0836a667158284c8a4a091de745fd5637ff1 (patch) | |
tree | 3f4a14e71ed6e16af30714327b840f71ee2c77ff /arch/arm/mach-pxa/include/mach/uncompress.h | |
parent | c95efee13303d9ff9e67f2600174f492039311ce (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h | 6 |
1 files changed, 6 insertions, 0 deletions
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) | |||
60 | || machine_is_csb726() || machine_is_stargate2() | 60 | || machine_is_csb726() || machine_is_stargate2() |
61 | || machine_is_cm_x300() || machine_is_balloon3()) | 61 | || machine_is_cm_x300() || machine_is_balloon3()) |
62 | uart_base = STUART_BASE; | 62 | uart_base = STUART_BASE; |
63 | |||
64 | if (machine_is_arcom_zeus()) { | ||
65 | uart_base = 0x10000000; /* nCS4 */ | ||
66 | uart_shift = 1; | ||
67 | uart_is_pxa = 0; | ||
68 | } | ||
63 | } | 69 | } |
64 | 70 | ||
65 | /* | 71 | /* |