From: johlstei@codeaurora.org (Jeff Ohlstein)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/20 v2] msm: allow uart to be conditionally disabled
Date: Wed, 6 Oct 2010 00:42:50 -0700 [thread overview]
Message-ID: <1286350979-19328-12-git-send-email-johlstei@codeaurora.org> (raw)
In-Reply-To: <1286350979-19328-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, 9 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index be05acc..def2a64 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
@@ -40,6 +43,9 @@ config ARCH_MSM_ARM11
config ARCH_MSM_SCORPION
bool
+config HAS_MSM_DEBUG_UART_PHYS
+ bool
+
config MSM_VIC
bool
@@ -92,6 +98,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"
@@ -109,6 +116,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-10-06 7:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-06 7:42 [PATCH 00/20 v2] Support for Qualcomm msm8660 target Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 01/20 v2] msm: create config option for proc-comm Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 02/20 v2] msm: io: MSM8X60 io support Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 03/20 v2] msm: initial irq definitions for MSM8X60 Jeff Ohlstein
2010-10-06 15:50 ` David Brown
2010-10-06 7:42 ` [PATCH 04/20 v2] msm: irqs-8x60: interrupt map Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 05/20 v2] msm: timer: support 8x60 timers Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 06/20 v2] msm: MSM8X60 RUMI3 board support Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 07/20 v2] msm: irq: rename existing entry-macro to entry-macro-vic Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 08/20 v2] msm: 8x60: gic initialization fixup for RUMI Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 09/20 v2] msm: clock: add dummy clock driver Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 10/20 v2] msm: dma: add stub functions for dma features not yet present on 8x60 Jeff Ohlstein
2010-10-06 7:42 ` Jeff Ohlstein [this message]
2010-10-06 7:42 ` [PATCH 12/20 v2] msm: add build support for msm8x60 target Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 13/20 v2] msm: 8x60: setup correct handlers for private interrupts Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 14/20 v2] msm: physical offset for MSM8X60 Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 15/20 v2] msm: add msm8x60_surf machine Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 16/20 v2] msm: MSM8X60 simulator board support Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 17/20 v2] msm: add MSM8x60 FFA support Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 18/20 v2] msm: Add MSM IOMMU support Jeff Ohlstein
2010-10-06 7:42 ` [PATCH 19/20 v2] msm: Platform initialization for the IOMMU driver Jeff Ohlstein
2010-10-06 14:28 ` Daniel Walker
2010-10-06 22:48 ` [PATCH] " Stepan Moskovchenko
2010-10-06 7:42 ` [PATCH 20/20 v2] 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=1286350979-19328-12-git-send-email-johlstei@codeaurora.org \
--to=johlstei@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.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).