diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2012-08-28 03:35:21 +0400 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2012-09-13 21:48:35 +0400 |
| commit | 10717e04d3502cf4a8aa6408d59093e2bbb4645b (patch) | |
| tree | 74dd29ce7ac74a7b2cab0c34ced7cddb7e0583d0 | |
| parent | 90eb385fd1bad5d4b7ad419d29763b28dd9d05a6 (diff) | |
| download | linux-10717e04d3502cf4a8aa6408d59093e2bbb4645b.tar.xz | |
ARM: msm: Fix early debug uart mapping on some memory configs
The uart mapping runs into the space allocated for lowmem on some
8960 boards when we have more than 512Mb of memory. We were
getting lucky before and our mapping wasn't part of DDR. Move the
mapping up into the vmalloc area which will always be outside of
the lowmem mapping regardless of how much lowmem actually exists.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h index a1752c0284fc..facf434d09be 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h @@ -46,7 +46,7 @@ #define MSM8960_TMR0_SIZE SZ_4K #ifdef CONFIG_DEBUG_MSM8960_UART -#define MSM_DEBUG_UART_BASE 0xE1040000 +#define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x16440000 #endif diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h index 5aed57dc808c..21a2a8859a9a 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h @@ -63,7 +63,7 @@ #define MSM8X60_TMR0_SIZE SZ_4K #ifdef CONFIG_DEBUG_MSM8660_UART -#define MSM_DEBUG_UART_BASE 0xE1040000 +#define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x19C40000 #endif |