summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2012-01-06 10:43:20 +0000
committerOlof Johansson <olof@lixom.net>2012-02-06 18:25:00 -0800
commit31bac1375bda9787f18b2f60e0e1ca62258ea09c (patch)
tree1ecfa032d2e0fa7b0c7b3124cc1355358931fc7b /arch/arm/mach-tegra
parent229c7b22a24b9996e3a3eb1a2748e255e16bc323 (diff)
downloadlinux-31bac1375bda9787f18b2f60e0e1ca62258ea09c.tar.gz
linux-31bac1375bda9787f18b2f60e0e1ca62258ea09c.tar.bz2
linux-31bac1375bda9787f18b2f60e0e1ca62258ea09c.zip
ARM: tegra: uncompress.h: Store UART address in a variable
This will allow a future change to auto-detect which UART to use. Signed-off-by: Doug Anderson <dianders@chromium.org> [swarren: Extracted from a larger patch by Doug] Signed-off-by: Stephen Warren <swarren@nvidia.com> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/include/mach/uncompress.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h
index 9797279e94de..bb3fd359f9fa 100644
--- a/arch/arm/mach-tegra/include/mach/uncompress.h
+++ b/arch/arm/mach-tegra/include/mach/uncompress.h
@@ -30,10 +30,10 @@
#define DEBUG_UART_SHIFT 2
+volatile u8 *uart;
+
static void putc(int c)
{
- volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
-
if (uart == NULL)
return;
@@ -50,8 +50,8 @@ static inline void arch_decomp_setup(void)
{
volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE;
u32 chip, div;
- volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
+ uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
if (uart == NULL)
return;