From: Colin Cross <ccross@android.com>
To: linux-tegra@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, olof@lixom.net,
konkers@android.com, Colin Cross <ccross@android.com>,
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 v2 05/28] ARM: tegra: Centralize macros to define debug uart base
Date: Sun, 23 Jan 2011 18:01:10 -0800 [thread overview]
Message-ID: <1295834493-5019-6-git-send-email-ccross@android.com> (raw)
In-Reply-To: <1295834493-5019-1-git-send-email-ccross@android.com>
Signed-off-by: Colin Cross <ccross@android.com>
---
arch/arm/mach-tegra/include/mach/debug-macro.S | 25 ++++-------------------
arch/arm/mach-tegra/include/mach/iomap.h | 14 +++++++++++++
arch/arm/mach-tegra/include/mach/uncompress.h | 18 +---------------
3 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
index a0e7c12..e0ebe65 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
ldr \rp, =IO_APB_PHYS @ physical
ldr \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
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF)
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
.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: ccross@android.com (Colin Cross)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 05/28] ARM: tegra: Centralize macros to define debug uart base
Date: Sun, 23 Jan 2011 18:01:10 -0800 [thread overview]
Message-ID: <1295834493-5019-6-git-send-email-ccross@android.com> (raw)
In-Reply-To: <1295834493-5019-1-git-send-email-ccross@android.com>
Signed-off-by: Colin Cross <ccross@android.com>
---
arch/arm/mach-tegra/include/mach/debug-macro.S | 25 ++++-------------------
arch/arm/mach-tegra/include/mach/iomap.h | 14 +++++++++++++
arch/arm/mach-tegra/include/mach/uncompress.h | 18 +---------------
3 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
index a0e7c12..e0ebe65 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
ldr \rp, =IO_APB_PHYS @ physical
ldr \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
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF)
+ orr \rp, \rp, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF)
+ orr \rv, \rv, #(TEGRA_DEBUG_UART_BASE & 0xFF00)
.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:[~2011-01-24 2:06 UTC|newest]
Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 2:01 [PATCH v2 00/28] Updates for Tegra support in 2.6.39 Colin Cross
2011-01-24 2:01 ` [PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-26 7:10 ` Colin Cross
2011-01-26 7:10 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 02/28] ARM: gic: Add functions to save and restore gic state Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-02-01 13:03 ` Russell King - ARM Linux
2011-02-01 13:03 ` Russell King - ARM Linux
2011-01-24 2:01 ` [PATCH v2 03/28] ARM: gic: Export irq chip functions Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 6:39 ` Santosh Shilimkar
2011-01-24 6:39 ` Santosh Shilimkar
2011-01-24 2:01 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support for re-enabling l2x0 Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-25 15:14 ` Catalin Marinas
2011-01-25 15:14 ` Catalin Marinas
2011-01-25 15:41 ` Russell King - ARM Linux
2011-01-25 15:41 ` Russell King - ARM Linux
2011-01-25 18:14 ` Catalin Marinas
2011-01-25 18:14 ` Catalin Marinas
2011-01-25 18:32 ` Santosh Shilimkar
2011-01-25 18:32 ` Santosh Shilimkar
2011-01-25 18:39 ` Will Deacon
[not found] ` <-8932138696981683633@unknownmsgid>
2011-02-04 23:32 ` Colin Cross
2011-02-04 23:32 ` Colin Cross
2011-02-04 23:32 ` Colin Cross
2011-02-04 23:43 ` Russell King - ARM Linux
2011-02-04 23:43 ` Russell King - ARM Linux
[not found] ` <20110204234331.GF8732-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-02-05 1:44 ` Colin Cross
2011-02-05 1:44 ` Colin Cross
2011-02-05 1:44 ` Colin Cross
[not found] ` <AANLkTi=fHnivHXHnYrQvdP6JWbEA3t1X3DuBxj5gN3H0-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-05 7:51 ` Santosh Shilimkar
2011-02-05 7:51 ` Santosh Shilimkar
2011-02-05 7:51 ` Santosh Shilimkar
[not found] ` <1bebe4b5c8590059b70a146d5486fa6a-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-05 9:47 ` Russell King - ARM Linux
2011-02-05 9:47 ` Russell King - ARM Linux
2011-02-05 9:47 ` Russell King - ARM Linux
2011-02-05 10:41 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support forre-enabling l2x0 Santosh Shilimkar
2011-02-05 10:41 ` Santosh Shilimkar
2011-02-05 16:36 ` Colin Cross
2011-02-05 16:36 ` Colin Cross
[not found] ` <AANLkTik_r4k_5o+F47vRbGPcWLwfgHgWqhym49XfhBZ9-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-07 6:13 ` Santosh Shilimkar
2011-02-07 6:13 ` Santosh Shilimkar
2011-02-07 6:13 ` Santosh Shilimkar
2011-01-24 2:01 ` Colin Cross [this message]
2011-01-24 2:01 ` [PATCH v2 05/28] ARM: tegra: Centralize macros to define debug uart base Colin Cross
2011-01-24 2:01 ` [PATCH v2 06/28] ARM: tegra: Add api to control internal powergating Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 07/28] ARM: tegra: irqs: Update irq list Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 08/28] ARM: tegra: Add prototypes for subsystem suspend functions Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 09/28] ARM: tegra: clock: Suspend fixes, and add new clocks Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 10/28] ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 11/28] ARM: tegra: timer: Add idle and suspend support to timers Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 12/28] ARM: tegra: irq: Add support for suspend wake sources Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 13/28] ARM: tegra: Add suspend and hotplug support Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 7:31 ` Colin Cross
2011-01-24 7:31 ` Colin Cross
2011-01-24 9:07 ` Russell King - ARM Linux
2011-01-24 9:07 ` Russell King - ARM Linux
2011-01-24 9:26 ` Colin Cross
2011-01-24 9:26 ` Colin Cross
2011-01-24 10:15 ` Russell King - ARM Linux
2011-01-24 10:15 ` Russell King - ARM Linux
2011-01-24 2:01 ` [PATCH v2 14/28] ARM: tegra: irq: Add set_wake and set_type support for suspend Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 15/28] ARM: tegra: irq: Add debugfs file to show wake irqs Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-27 19:45 ` Stephen Boyd
2011-01-27 19:45 ` Stephen Boyd
2011-01-24 2:01 ` [PATCH v2 16/28] ARM: tegra: irq: Implement retrigger Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 17/28] ARM: tegra: gpio: Add support for waking from suspend Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 18/28] ARM: tegra: add CPU_IDLE driver Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-27 20:38 ` Stephen Boyd
2011-01-27 20:38 ` Stephen Boyd
2011-01-27 21:51 ` Colin Cross
2011-01-27 21:51 ` Colin Cross
2011-01-27 22:07 ` Colin Cross
2011-01-27 22:07 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 19/28] ARM: tegra: iomap: Add missing devices, fix use of SZ_8, SZ_64 Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 14:41 ` Mark Brown
2011-01-24 14:41 ` Mark Brown
2011-01-24 18:50 ` Colin Cross
2011-01-24 18:50 ` Colin Cross
2011-01-24 19:35 ` Mark Brown
2011-01-24 19:35 ` Mark Brown
2011-01-24 19:52 ` Colin Cross
2011-01-24 19:52 ` Colin Cross
2011-01-24 20:26 ` Mark Brown
2011-01-24 20:26 ` Mark Brown
2011-01-24 20:52 ` Colin Cross
2011-01-24 20:52 ` Colin Cross
2011-01-24 21:08 ` Mark Brown
2011-01-24 21:08 ` Mark Brown
2011-01-24 21:24 ` Colin Cross
2011-01-24 21:24 ` Colin Cross
2011-01-25 4:26 ` Kyungmin Park
2011-01-25 4:26 ` Kyungmin Park
2011-01-24 2:01 ` [PATCH v2 21/28] ARM: tegra: Allow overriding arch_reset Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 22/28] ARM: tegra: dma: Fix critical data corruption bugs Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 23/28] ARM: tegra: add tegra_defconfig Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 24/28] ARM: tegra: Use writel_relaxed in tegra_init_cache Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 25/28] ARM: tegra: suspend: Save protected aperture across LP0 Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 26/28] ARM: tegra: suspend: protect suspend functions with CONFIG_PM Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 27/28] ARM: tegra: enable emc clock updates after lp0 Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 28/28] ARM: tegra: clock: Add forward reference to struct clk Colin Cross
2011-01-24 2:01 ` Colin Cross
2011-01-24 10:26 ` Russell King - ARM Linux
2011-01-24 10:26 ` Russell King - ARM Linux
2011-01-25 1:23 ` Colin Cross
2011-01-25 1:23 ` Colin Cross
2011-01-26 3:19 ` Grant Likely
2011-01-26 3:19 ` Grant Likely
2011-01-26 3:21 ` Colin Cross
2011-01-26 3:21 ` Colin Cross
2011-01-26 4:16 ` Grant Likely
2011-01-26 4:16 ` Grant Likely
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=1295834493-5019-6-git-send-email-ccross@android.com \
--to=ccross@android.com \
--cc=gking@nvidia.com \
--cc=jeremy.kerr@canonical.com \
--cc=konkers@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=olof@lixom.net \
--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 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.