Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f6fc15a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes 

Merge "arm: pxa: fixes for v3.18-rc2" from Robert Jarzmik:

One small fix for a bug triggered by the activation of low level debug
code in all pxa variants in v3.17. The fix is a trivial Kconfig value
fix for an addressing conflict.
parents efc176a8 cde7fc87

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ config DEBUG_UART_VIRT 
	default 0xf1c28000 if DEBUG_SUNXI_UART0

	default 0xf1c28400 if DEBUG_SUNXI_UART1

	default 0xf1f02800 if DEBUG_SUNXI_R_UART

	default 0xf2100000 if DEBUG_PXA_UART1

	default 0xf6200000 if DEBUG_PXA_UART1

	default 0xf4090000 if ARCH_LPC32XX

	default 0xf4200000 if ARCH_GEMINI

	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

arch/arm/mach-pxa/include/mach/addr-map.h

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ 
#define DMEMC_VIRT		IOMEM(0xf6100000)

#define DMEMC_SIZE		0x00100000



/*

 * Reserved space for low level debug virtual addresses within

 * 0xf6200000..0xf6201000

 */



/*

 * Internal Memory Controller (PXA27x and later)

 */