Commit c8b8a93a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: relocate static I/O mapping 



The address range 0xfee00000-0xfeffffff is used for PCI and
PCMCIA I/O port mappings, but OMAP1 has its static mappings
there as well.

Move the OMAP1 addresses a little higher to avoid crashing
at boot.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e37a0bca

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -1837,9 +1837,9 @@ config DEBUG_UART_VIRT 
	default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

	default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xff0b0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xff0b0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xff0b9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xffd01000 if DEBUG_HIP01_UART

	default DEBUG_UART_PHYS if !MMU

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

arch/arm/mach-omap1/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline u32 omap_cs3_phys(void) 


#endif	/* ifndef __ASSEMBLER__ */



#define OMAP1_IO_OFFSET		0x01000000	/* Virtual IO = 0xfefb0000 */

#define OMAP1_IO_OFFSET		0x00f00000	/* Virtual IO = 0xff0b0000 */

#define OMAP1_IO_ADDRESS(pa)	IOMEM((pa) - OMAP1_IO_OFFSET)



#include <mach/serial.h>