[PATCH 6/7] ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h
From: Arnd Bergmann <arnd@arndb.de>
Date: 2019-08-09 16:34:14
Also in:
linux-arm-kernel, linux-gpio, linux-i2c, lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-iop32x/include/mach/uncompress.h | 18 ++---------------- 1 file 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)
--
2.20.0