From: Jeff Ohlstein <johlstei@codeaurora.org>
To: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Daniel Walker <dwalker@codeaurora.org>,
Jeff Ohlstein <johlstei@codeaurora.org>,
David Brown <davidb@codeaurora.org>,
Bryan Huntsman <bryanh@codeaurora.org>,
Gregory Bean <gbean@codeaurora.org>,
Steve Muckle <smuckle@codeaurora.org>,
Brian Swetland <swetland@google.com>,
Tony Lindgren <tony@atomide.com>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 15/24] msm: allow uart to be conditionally disabled
Date: Tue, 24 Aug 2010 21:57:44 -0700 [thread overview]
Message-ID: <1282712273-344-16-git-send-email-johlstei@codeaurora.org> (raw)
In-Reply-To: <1282712273-344-1-git-send-email-johlstei@codeaurora.org>
From: Daniel Walker <dwalker@codeaurora.org>
Some MSM targets don't select the debug UART in this way. For those we
need to disable this selection mechanism.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
---
arch/arm/mach-msm/Kconfig | 8 +++++++-
arch/arm/mach-msm/include/mach/debug-macro.S | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 60ad211..27fc183 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -11,6 +11,7 @@ config ARCH_MSM7X00A
select MSM_SMD_PKG3
select CPU_V6
select MSM_PROC_COMM
+ select HAS_MSM_DEBUG_UART_PHYS
config ARCH_MSM7X30
bool "MSM7x30"
@@ -20,6 +21,7 @@ config ARCH_MSM7X30
select CPU_V7
select MSM_REMOTE_SPINLOCK_DEKKERS
select MSM_PROC_COMM
+ select HAS_MSM_DEBUG_UART_PHYS
config ARCH_QSD8X50
bool "QSD8X50"
@@ -29,6 +31,7 @@ config ARCH_QSD8X50
select CPU_V7
select MSM_REMOTE_SPINLOCK_LDREX
select MSM_PROC_COMM
+ select HAS_MSM_DEBUG_UART_PHYS
endchoice
@@ -41,7 +44,8 @@ config ARCH_MSM_SCORPION
bool
config ARCH_MSM_SCORPIONMP
bool
-
+config HAS_MSM_DEBUG_UART_PHYS
+ bool
config MSM_VIC
bool
@@ -95,6 +99,7 @@ config MSM_DEBUG_UART
default 2 if MSM_DEBUG_UART2
default 3 if MSM_DEBUG_UART3
+if HAS_MSM_DEBUG_UART_PHYS
choice
prompt "Debug UART"
@@ -112,6 +117,7 @@ choice
config MSM_DEBUG_UART3
bool "UART3"
endchoice
+endif
config MSM_SMD_PKG3
bool
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 528750f..238c4f1 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -19,7 +19,7 @@
#include <mach/hardware.h>
#include <mach/msm_iomap.h>
-#ifdef CONFIG_MSM_DEBUG_UART
+#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
.macro addruart, rx, tmp
@ see if the MMU is enabled and select appropriate base address
mrc p15, 0, \rx, c1, c0
--
1.7.2.1
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2010-08-25 4:58 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 4:57 [PATCH 00/24] Support for Qualcomm msm8660 target Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 01/24] msm: create config option for proc-comm Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 02/24] arm: Kconfig option for ARCH_MSM_SCORPIONMP Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 03/24] arm: mm: add proc info for ScorpionMP Jeff Ohlstein
2010-08-27 13:54 ` Catalin Marinas
2010-08-27 15:29 ` Daniel Walker
2010-08-27 16:04 ` Catalin Marinas
2010-08-27 16:33 ` Daniel Walker
2010-08-27 16:49 ` Catalin Marinas
2010-08-27 19:53 ` Daniel Walker
2010-08-31 12:18 ` Catalin Marinas
2010-08-31 16:44 ` Daniel Walker
2010-09-01 5:56 ` Shilimkar, Santosh
2010-09-04 14:32 ` Russell King - ARM Linux
2010-09-06 22:22 ` Daniel Walker
2010-09-04 14:31 ` Russell King - ARM Linux
2010-08-25 4:57 ` [PATCH 04/24] GIC: Dont disable INT in ack callback Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 05/24] msm: io: MSM8X60 io support Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 06/24] msm: initial irq definitions for MSM8X60 Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 07/24] msm: irqs-8x60: interrupt map Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 08/24] msm: timer: support 8x60 timers Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 09/24] msm: MSM8X60 RUMI3 board support Jeff Ohlstein
2010-09-02 11:08 ` Russell King - ARM Linux
2010-09-09 3:15 ` Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 10/24] msm: irq: rename existing entry-macro to entry-macro-vic Jeff Ohlstein
2010-09-02 11:10 ` Russell King - ARM Linux
2010-08-25 4:57 ` [PATCH 11/24] msm: 8x60: gic initialization fixup for RUMI Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 12/24] msm: clock: add dummy clock driver Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 13/24] dma: add stub functions for dma features not yet present on 8x60 Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 14/24] msm: add hotplug stub functions Jeff Ohlstein
2010-09-02 11:11 ` Russell King - ARM Linux
2010-09-02 16:49 ` Daniel Walker
2010-09-02 17:12 ` Russell King - ARM Linux
2010-09-02 22:25 ` Daniel Walker
2010-09-02 22:36 ` Daniel Walker
2010-09-03 7:31 ` Russell King - ARM Linux
2010-09-03 16:23 ` Daniel Walker
2010-08-25 4:57 ` Jeff Ohlstein [this message]
2010-08-25 4:57 ` [PATCH 16/24] msm: add build support for msm8x60 target Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 17/24] msm: 8x60: setup correct handlers for private interrupts Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 18/24] msm: physical offset for MSM8X60 Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 19/24] msm: add msm8x60_surf machine Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 20/24] msm: MSM8X60 simulator board support Jeff Ohlstein
2010-09-02 11:13 ` Russell King - ARM Linux
2010-09-02 18:19 ` David Brown
2010-09-02 18:52 ` Russell King - ARM Linux
2010-08-25 4:57 ` [PATCH 21/24] msm: add MSM8x60 FFA support Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 22/24] msm: Add MSM IOMMU support Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 23/24] msm: Platform initialization for the IOMMU driver Jeff Ohlstein
2010-08-25 4:57 ` [PATCH 24/24] msm: Platform data for msm8x60 IOMMUs Jeff Ohlstein
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=1282712273-344-16-git-send-email-johlstei@codeaurora.org \
--to=johlstei@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@codeaurora.org \
--cc=gbean@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=pavel@ucw.cz \
--cc=smuckle@codeaurora.org \
--cc=swetland@google.com \
--cc=tony@atomide.com \
/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).