diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-08-09 18:33:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-14 15:36:22 +0200 |
| commit | ba9ef6afc45ff4eb2d9c6e26c6a94279ee3b4348 (patch) | |
| tree | d36b3880362093d0b4371eecb9656614e3e15c83 | |
| parent | c7b68049943079550d4e6af0f10aa3aabd64131a (diff) | |
| download | linux-ba9ef6afc45ff4eb2d9c6e26c6a94279ee3b4348.tar.bz2 | |
ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h
All supported uarts use the same address: IQ80321_UART and IQ31244_UART
are both defined to the default value of 0xfe800000. By using that as
the address unconditionally, all dependencies on other machine headers
can be avoided.
Link: https://lore.kernel.org/r/20190809163334.489360-6-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-iop32x/include/mach/uncompress.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index ed4ac3e28fa1..c8548875d942 100644 --- a/arch/arm/mach-iop32x/include/mach/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -6,9 +6,8 @@ #include <asm/types.h> #include <asm/mach-types.h> #include <linux/serial_reg.h> -#include <mach/hardware.h> -volatile u8 *uart_base; +#define uart_base ((volatile u8 *)0xfe800000) #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) @@ -23,17 +22,4 @@ static inline void flush(void) { } -static __inline__ void __arch_decomp_setup(unsigned long arch_id) -{ - if (machine_is_iq80321()) - uart_base = (volatile u8 *)IQ80321_UART; - else if (machine_is_iq31244() || machine_is_em7210()) - uart_base = (volatile u8 *)IQ31244_UART; - else - uart_base = (volatile u8 *)0xfe800000; -} - -/* - * nothing to do - */ -#define arch_decomp_setup() __arch_decomp_setup(arch_id) +#define arch_decomp_setup() do { } while (0) |