Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: tegra: Introduce define DEBUG_UART_SHIFT

Browse Source 
This removes the need for the variable "shift" in all functions in
uncompress.h.

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>
This commit is contained in:
Doug Anderson 2012-01-06 10:43:19 +00:00 committed by Olof Johansson
parent e53b7d87cc
commit 229c7b22a2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-tegra/include/mach/uncompress.h
View File

@ -2,10 +2,12 @@
* arch/arm/mach-tegra/include/mach/uncompress.h * arch/arm/mach-tegra/include/mach/uncompress.h
* *
* Copyright (C) 2010 Google, Inc. * Copyright (C) 2010 Google, Inc.
* Copyright (C) 2011 Google, Inc.
* *
* Author: * Author:
* Colin Cross <ccross@google.com> * Colin Cross <ccross@google.com>
* Erik Gilling <konkers@google.com> * Erik Gilling <konkers@google.com>
* Doug Anderson <dianders@chromium.org>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and * License version 2, as published by the Free Software Foundation, and
@ -26,17 +28,18 @@
#include <mach/iomap.h> #include <mach/iomap.h>
#define DEBUG_UART_SHIFT 2
static void putc(int c) static void putc(int c)
{ {
volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL) if (uart == NULL)
return; return;
while (!(uart[UART_LSR << shift] & UART_LSR_THRE)) while (!(uart[UART_LSR << DEBUG_UART_SHIFT] & UART_LSR_THRE))
barrier(); barrier();
uart[UART_TX << shift] = c; uart[UART_TX << DEBUG_UART_SHIFT] = c;
} }
static inline void flush(void) static inline void flush(void)
@ -48,7 +51,6 @@ static inline void arch_decomp_setup(void)
volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE; volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE;
u32 chip, div; u32 chip, div;
volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;
int shift = 2;
if (uart == NULL) if (uart == NULL)
return; return;
@ -59,10 +61,10 @@ static inline void arch_decomp_setup(void)
else else
div = 0x00dd; div = 0x00dd;
uart[UART_LCR << shift] |= UART_LCR_DLAB; uart[UART_LCR << DEBUG_UART_SHIFT] |= UART_LCR_DLAB;
uart[UART_DLL << shift] = div & 0xff; uart[UART_DLL << DEBUG_UART_SHIFT] = div & 0xff;
uart[UART_DLM << shift] = div >> 8; uart[UART_DLM << DEBUG_UART_SHIFT] = div >> 8;
uart[UART_LCR << shift] = 3; uart[UART_LCR << DEBUG_UART_SHIFT] = 3;
} }
static inline void arch_decomp_wdog(void) static inline void arch_decomp_wdog(void)