From: David Brown <davidb@codeaurora.org>
To: David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>
Cc: Stephen Boyd <sboyd@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH 04/24] ARM: msm: Fix early debug uart mapping on some memory configs
Date: Wed, 12 Sep 2012 09:58:40 -0700 [thread overview]
Message-ID: <1347469140-25069-5-git-send-email-davidb@codeaurora.org> (raw)
In-Reply-To: <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
From: Stephen Boyd <sboyd@codeaurora.org>
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>
---
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 +-
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 a1752c0..facf434 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 5aed57d..21a2a88 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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2012-09-12 17:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
2012-09-12 16:58 ` [PATCH 01/24] ARM: msm: Remove msm_hw_reset_hook David Brown
2012-09-12 17:09 ` [GIT PULL] msm-core changes for v3.7 David Brown
2012-09-12 16:58 ` [PATCH 02/24] ARM: msm: clock-pcom: Mark functions static David Brown
2012-09-12 16:58 ` [PATCH 03/24] ARM: msm: Remove unused idle.c David Brown
2012-09-12 16:58 ` David Brown [this message]
2012-09-12 16:58 ` [PATCH 05/24] ARM: msm: io: Remove 7x30 iomap region from 7x00 David Brown
2012-09-12 16:58 ` [PATCH 06/24] ARM: msm: io: Change the default static iomappings to be shared David Brown
2012-09-12 16:58 ` [PATCH 07/24] ARM: msm: Add handle_irq handler for 8660 DT machine David Brown
2012-09-12 16:58 ` [PATCH 08/24] ARM: msm: Add msm8660-surf.dts to Makefile.boot David Brown
2012-09-12 16:58 ` [PATCH 09/24] ARM: msm: Remove call to missing FPGA init on 8660 David Brown
2012-09-12 16:58 ` [PATCH 10/24] ARM: msm: Fix sparse warnings due to incorrect type David Brown
2012-09-12 16:58 ` [PATCH 11/24] ARM: msm: Don't touch GIC registers outside of GIC code David Brown
2012-09-12 16:58 ` [PATCH 12/24] ARM: msm: Allow timer.c to compile on multiple targets David Brown
2012-09-12 16:58 ` [PATCH 13/24] ARM: msm: Add DT support to msm_timer David Brown
2012-09-12 16:58 ` [PATCH 14/24] ARM: msm: Move 8660 to DT timer David Brown
2012-09-12 16:58 ` [PATCH 15/24] ARM: msm: Make 8660 a DT only target David Brown
2012-09-12 16:58 ` [PATCH 16/24] ARM: msm: Rename board-msm8x60 to signify its DT only status David Brown
2012-09-12 16:58 ` [PATCH 17/24] ARM: msm: Move io mapping prototypes to common.h David Brown
2012-09-12 16:58 ` [PATCH 18/24] ARM: msm: Add DT support for 8960 David Brown
2012-09-12 16:58 ` [PATCH 19/24] ARM: msm: Remove non-DT targets from 8960 David Brown
2012-09-12 16:58 ` [PATCH 20/24] ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail David Brown
2012-09-12 16:58 ` [PATCH 21/24] ARM: msm: Remove unused acpuclock-arm11 David Brown
2012-09-12 16:58 ` [PATCH 22/24] ARM: msm: Remove uncompiled board-msm7x27 David Brown
2012-09-12 16:58 ` [PATCH 23/24] ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist David Brown
2012-09-12 16:59 ` [PATCH 24/24] ARM: msm: Allow 8960 and 8660 to compile together David Brown
2012-09-17 0:38 ` Olof Johansson
2012-09-13 6:36 ` [GIT PULL] msm-core changes for v3.7 Olof Johansson
2012-09-13 7:31 ` David Brown
2012-09-13 7:33 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347469140-25069-5-git-send-email-davidb@codeaurora.org \
--to=davidb@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).