diff options
author | Doug Anderson <dianders@chromium.org> | 2012-01-06 05:43:20 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-02-06 21:25:00 -0500 |
commit | 31bac1375bda9787f18b2f60e0e1ca62258ea09c (patch) | |
tree | 1ecfa032d2e0fa7b0c7b3124cc1355358931fc7b /arch/arm/mach-tegra | |
parent | 229c7b22a24b9996e3a3eb1a2748e255e16bc323 (diff) |
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.h | 6 |
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 @@ | |||
30 | 30 | ||
31 | #define DEBUG_UART_SHIFT 2 | 31 | #define DEBUG_UART_SHIFT 2 |
32 | 32 | ||
33 | volatile u8 *uart; | ||
34 | |||
33 | static void putc(int c) | 35 | static void putc(int c) |
34 | { | 36 | { |
35 | volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; | ||
36 | |||
37 | if (uart == NULL) | 37 | if (uart == NULL) |
38 | return; | 38 | return; |
39 | 39 | ||
@@ -50,8 +50,8 @@ static inline void arch_decomp_setup(void) | |||
50 | { | 50 | { |
51 | volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE; | 51 | volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE; |
52 | u32 chip, div; | 52 | u32 chip, div; |
53 | volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; | ||
54 | 53 | ||
54 | uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; | ||
55 | if (uart == NULL) | 55 | if (uart == NULL) |
56 | return; | 56 | return; |
57 | 57 | ||