diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:16:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:16:57 +0200 |
| commit | 976eb445e2051735346779dbdaeb681c7641fec4 (patch) | |
| tree | 0e1fd55848ef3299de19302103391fcb5a66c814 /arch/arm/mach-ux500/include/mach/uncompress.h | |
| parent | ced62c33fc434b9d44118c9f35803af8088cc3fe (diff) | |
| parent | 72fb92200d6c31b9982c06784e4bcff2f5b7d8b6 (diff) | |
| download | talos-op-linux-976eb445e2051735346779dbdaeb681c7641fec4.tar.gz talos-op-linux-976eb445e2051735346779dbdaeb681c7641fec4.zip | |
Merge branch 'ux500-del-u5500-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
Linus Walleij <linus.walleij@linaro.org> writes:
Delete U5500 after obsoletion of this ASIC, including two patches to the MFD
subsystem that have been ACK:ed by Samuel Ortiz.
* 'ux500-del-u5500-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mfd/ab5500: delete AB5500 support
mfd/db5500-prcmu: delete DB5500 PRCMU support
ARM: ux500: delete U5500 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index 6fb3c4b0105d..34775baadaea 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -50,11 +50,8 @@ 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_u5500()) - ux500_uart_base = U5500_UART0_BASE; - else - ux500_uart_base = U8500_UART2_BASE; + /* Use machine_is_foo() macro if you need to switch base someday */ + ux500_uart_base = U8500_UART2_BASE; } #define arch_decomp_wdog() /* nothing to do here */ |
