diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-27 12:29:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-27 12:29:06 -0700 |
| commit | 1f6fc15a13e4d2f159513bc8e704e533fb6e4110 (patch) | |
| tree | eda50c5e11ea249de5bee40041f48454b7a9a069 /arch | |
| parent | efc176a8ee1f959b89292597bd8a99417475a79a (diff) | |
| parent | cde7fc879969f933614b1256df2625d6ff637bab (diff) | |
| download | linux-1f6fc15a13e4d2f159513bc8e704e533fb6e4110.tar.bz2 | |
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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig.debug | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/addr-map.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 03dc4c1a8736..d8f6a2ec3d4e 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -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 || \ diff --git a/arch/arm/mach-pxa/include/mach/addr-map.h b/arch/arm/mach-pxa/include/mach/addr-map.h index bbf9df37ad4b..d28fe291233a 100644 --- a/arch/arm/mach-pxa/include/mach/addr-map.h +++ b/arch/arm/mach-pxa/include/mach/addr-map.h @@ -39,6 +39,11 @@ #define DMEMC_SIZE 0x00100000 /* + * Reserved space for low level debug virtual addresses within + * 0xf6200000..0xf6201000 + */ + +/* * Internal Memory Controller (PXA27x and later) */ #define IMEMC_PHYS 0x58000000 |