diff options
| author | Lee Jones <lee.jones@linaro.org> | 2011-08-26 16:54:07 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-08-30 09:22:57 +0200 |
| commit | 110c2c2f40647d31994c09f0afd1411e71f48a32 (patch) | |
| tree | c76703cfaf57605452d29bf0c9f8845d852eb170 /arch/arm/mach-ux500/include/mach/uncompress.h | |
| parent | 458eef2f4d73a55efa835ed891922e31efe91920 (diff) | |
mach-ux500: remove most of the ugly machine_is_*() calls
Do more work in the per-machine init calls instead of customizing
each init call.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index 7dd08074c37..6fb3c4b0105 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -51,15 +51,9 @@ static void flush(void) static inline void arch_decomp_setup(void) { /* Check in run time if we run on an U8500 or U5500 */ - if (machine_is_u8500() || - machine_is_svp8500v1() || - machine_is_svp8500v2() || - machine_is_hrefv60() || - machine_is_snowball()) - ux500_uart_base = U8500_UART2_BASE; - else if (machine_is_u5500()) + if (machine_is_u5500()) ux500_uart_base = U5500_UART0_BASE; - else /* not much can be done to help here */ + else ux500_uart_base = U8500_UART2_BASE; } |