ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h (ba9ef6af) · Commits · 戴 / test

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>

arch/arm/mach-iop32x/include/mach/uncompress.h

+2 −16

Original line number	Diff line number	Diff line
		@@ -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)

Admin message