From: ccross@android.com (Colin Cross)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/21] ARM: tegra: Centralize macros to define debug uart base
Date: Sun, 5 Dec 2010 15:08:51 -0800 [thread overview]
Message-ID: <1291590548-7341-5-git-send-email-ccross@android.com> (raw)
In-Reply-To: <1291590548-7341-1-git-send-email-ccross@android.com>
From: Colin Cross <ccross@google.com>
Signed-off-by: Colin Cross <ccross@google.com>
---
arch/arm/mach-tegra/include/mach/debug-macro.S | 31 ++++++-----------------
arch/arm/mach-tegra/include/mach/iomap.h | 14 ++++++++++
arch/arm/mach-tegra/include/mach/uncompress.h | 18 +------------
3 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
index 8ea3bff..2e3b8e3 100644
--- a/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ b/arch/arm/mach-tegra/include/mach/debug-macro.S
@@ -19,30 +19,15 @@
*/
#include <mach/io.h>
+#include <mach/iomap.h>
- .macro addruart, rp, rv
- ldreq \rp, =IO_APB_PHYS @ physical
- ldrne \rv, =IO_APB_VIRT @ virtual
-#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
-#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
-#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
- orr \rp, \rp, #0x6000
- orr \rv, \rv, #0x6000
-#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
- orr \rp, \rp, #0x6000
- orr \rp, \rp, #0x40
- orr \rv, \rv, #0x6000
- orr \rv, \rv, #0x40
-#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
- orr \rp, \rp, #0x6200
- orr \rv, \rv, #0x6200
-#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
- orr \rp, \rp, #0x6300
- orr \rv, \rv, #0x6300
-#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
- orr \rp, \rp, #0x6400
- orr \rv, \rv, #0x6400
-#endif
+ .macro addruart, rp, rv
+ ldr \rp, =IO_APB_PHYS @ physical
+ ldr \rv, =IO_APB_VIRT @ virtual
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0x00FF)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0x00FF)
.endm
#define UART_SHIFT 2
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h
index 44a4f4b..325eca3 100644
--- a/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@ -221,4 +221,18 @@
#define TEGRA_SDMMC4_BASE 0xC8000600
#define TEGRA_SDMMC4_SIZE SZ_512
+#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
+# define TEGRA_DEBUG_UART_BASE 0
+#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTA_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTB_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTC_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTD_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTE_BASE
+#endif
+
#endif
diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h
index 6c4dd81..4e83237 100644
--- a/arch/arm/mach-tegra/include/mach/uncompress.h
+++ b/arch/arm/mach-tegra/include/mach/uncompress.h
@@ -26,23 +26,9 @@
#include <mach/iomap.h>
-#if defined(CONFIG_TEGRA_DEBUG_UARTA)
-#define DEBUG_UART_BASE TEGRA_UARTA_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
-#define DEBUG_UART_BASE TEGRA_UARTB_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
-#define DEBUG_UART_BASE TEGRA_UARTC_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
-#define DEBUG_UART_BASE TEGRA_UARTD_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
-#define DEBUG_UART_BASE TEGRA_UARTE_BASE
-#else
-#define DEBUG_UART_BASE NULL
-#endif
-
static void putc(int c)
{
- volatile u8 *uart = (volatile u8 *)DEBUG_UART_BASE;
+ volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL)
@@ -59,7 +45,7 @@ static inline void flush(void)
static inline void arch_decomp_setup(void)
{
- volatile u8 *uart = (volatile u8 *)DEBUG_UART_BASE;
+ volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL)
--
1.7.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Colin Cross <ccross@android.com>
To: linux-tegra@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
Colin Cross <ccross@google.com>, Colin Cross <ccross@android.com>,
Erik Gilling <konkers@android.com>,
Olof Johansson <olof@lixom.net>,
Russell King <linux@arm.linux.org.uk>,
Tony Lindgren <tony@atomide.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Jeremy Kerr <jeremy.kerr@canonical.com>,
Gary King <gking@nvidia.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 04/21] ARM: tegra: Centralize macros to define debug uart base
Date: Sun, 5 Dec 2010 15:08:51 -0800 [thread overview]
Message-ID: <1291590548-7341-5-git-send-email-ccross@android.com> (raw)
In-Reply-To: <1291590548-7341-1-git-send-email-ccross@android.com>
From: Colin Cross <ccross@google.com>
Signed-off-by: Colin Cross <ccross@google.com>
---
arch/arm/mach-tegra/include/mach/debug-macro.S | 31 ++++++-----------------
arch/arm/mach-tegra/include/mach/iomap.h | 14 ++++++++++
arch/arm/mach-tegra/include/mach/uncompress.h | 18 +------------
3 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
index 8ea3bff..2e3b8e3 100644
--- a/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ b/arch/arm/mach-tegra/include/mach/debug-macro.S
@@ -19,30 +19,15 @@
*/
#include <mach/io.h>
+#include <mach/iomap.h>
- .macro addruart, rp, rv
- ldreq \rp, =IO_APB_PHYS @ physical
- ldrne \rv, =IO_APB_VIRT @ virtual
-#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
-#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
-#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
- orr \rp, \rp, #0x6000
- orr \rv, \rv, #0x6000
-#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
- orr \rp, \rp, #0x6000
- orr \rp, \rp, #0x40
- orr \rv, \rv, #0x6000
- orr \rv, \rv, #0x40
-#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
- orr \rp, \rp, #0x6200
- orr \rv, \rv, #0x6200
-#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
- orr \rp, \rp, #0x6300
- orr \rv, \rv, #0x6300
-#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
- orr \rp, \rp, #0x6400
- orr \rv, \rv, #0x6400
-#endif
+ .macro addruart, rp, rv
+ ldr \rp, =IO_APB_PHYS @ physical
+ ldr \rv, =IO_APB_VIRT @ virtual
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0x00FF)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0x00FF)
.endm
#define UART_SHIFT 2
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h
index 44a4f4b..325eca3 100644
--- a/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@ -221,4 +221,18 @@
#define TEGRA_SDMMC4_BASE 0xC8000600
#define TEGRA_SDMMC4_SIZE SZ_512
+#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
+# define TEGRA_DEBUG_UART_BASE 0
+#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTA_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTB_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTC_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTD_BASE
+#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
+# define TEGRA_DEBUG_UART_BASE TEGRA_UARTE_BASE
+#endif
+
#endif
diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h
index 6c4dd81..4e83237 100644
--- a/arch/arm/mach-tegra/include/mach/uncompress.h
+++ b/arch/arm/mach-tegra/include/mach/uncompress.h
@@ -26,23 +26,9 @@
#include <mach/iomap.h>
-#if defined(CONFIG_TEGRA_DEBUG_UARTA)
-#define DEBUG_UART_BASE TEGRA_UARTA_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
-#define DEBUG_UART_BASE TEGRA_UARTB_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
-#define DEBUG_UART_BASE TEGRA_UARTC_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
-#define DEBUG_UART_BASE TEGRA_UARTD_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
-#define DEBUG_UART_BASE TEGRA_UARTE_BASE
-#else
-#define DEBUG_UART_BASE NULL
-#endif
-
static void putc(int c)
{
- volatile u8 *uart = (volatile u8 *)DEBUG_UART_BASE;
+ volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL)
@@ -59,7 +45,7 @@ static inline void flush(void)
static inline void arch_decomp_setup(void)
{
- volatile u8 *uart = (volatile u8 *)DEBUG_UART_BASE;
+ volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL)
--
1.7.3.1
next prev parent reply other threads:[~2010-12-05 23:08 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-05 23:08 [PATCH 00/21] Updates for Tegra support in 2.6.38 Colin Cross
2010-12-05 23:08 ` [PATCH 01/21] ARM: tegra: irq: Rename gic pointers to avoid conflicts Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 02/21] ARM: gic: Add functions to save and restore gic state Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:30 ` Russell King - ARM Linux
2010-12-05 23:30 ` Russell King - ARM Linux
2010-12-05 23:52 ` Colin Cross
2010-12-05 23:52 ` Colin Cross
2010-12-05 23:08 ` [PATCH 03/21] ARM: gic: Export irq chip functions Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` Colin Cross [this message]
2010-12-05 23:08 ` [PATCH 04/21] ARM: tegra: Centralize macros to define debug uart base Colin Cross
2010-12-05 23:08 ` [PATCH 05/21] ARM: tegra: Add api to control internal powergating Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 06/21] ARM: tegra: irqs: Update irq list Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 07/21] ARM: tegra: Add prototypes for subsystem suspend functions Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 08/21] ARM: tegra: clock: Suspend fixes, and add new clocks Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 09/21] ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 10/21] ARM: tegra: timer: Add idle and suspend support to timers Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 11/21] ARM: tegra: irq: Add support for suspend wake sources Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-05 23:08 ` [PATCH 12/21] ARM: tegra: Add suspend and hotplug support Colin Cross
2010-12-05 23:08 ` Colin Cross
2010-12-06 0:01 ` Russell King - ARM Linux
2010-12-06 0:01 ` Russell King - ARM Linux
2010-12-05 23:09 ` [PATCH 13/21] ARM: tegra: irq: Add set_wake and set_type support for suspend Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 14/21] ARM: tegra: irq: Add debugfs file to show wake irqs Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-06 21:07 ` Stephen Boyd
2010-12-06 21:07 ` Stephen Boyd
2010-12-05 23:09 ` [PATCH 15/21] ARM: tegra: irq: Implement retrigger Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 16/21] ARM: tegra: gpio: Add support for waking from suspend Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 17/21] ARM: tegra: add CPU_IDLE driver Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 18/21] ARM: tegra: iomap: Add missing devices, fix use of SZ_8, SZ_64 Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 19/21] ARM: tegra: cpufreq: Disable cpufreq during suspend Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:09 ` [PATCH 20/21] ARM: tegra: Allow overriding arch_reset Colin Cross
2010-12-05 23:09 ` Colin Cross
2010-12-05 23:39 ` Russell King - ARM Linux
2010-12-05 23:39 ` Russell King - ARM Linux
2010-12-05 23:09 ` [PATCH 21/21] ARM: tegra: dma: Fix critical data corruption bugs Colin Cross
2010-12-05 23:09 ` Colin Cross
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=1291590548-7341-5-git-send-email-ccross@android.com \
--to=ccross@android.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.