Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 229c7b22 authored by Doug Anderson's avatar Doug Anderson Committed by Olof Johansson
Browse files

ARM: tegra: Introduce define DEBUG_UART_SHIFT 



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

Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
[swarren: Extracted from a larger patch by Doug]
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent e53b7d87

arch/arm/mach-tegra/include/mach/uncompress.h

+10 −8
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
 * arch/arm/mach-tegra/include/mach/uncompress.h

 *

 * Copyright (C) 2010 Google, Inc.

 * Copyright (C) 2011 Google, Inc.

 *

 * Author:

 *	Colin Cross <ccross@google.com>

 *	Erik Gilling <konkers@google.com>

 *	Doug Anderson <dianders@chromium.org>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -26,17 +28,18 @@ 


#include <mach/iomap.h>



#define DEBUG_UART_SHIFT 2



static void putc(int c)

{

	volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;

	int shift = 2;



	if (uart == NULL)

		return;



	while (!(uart[UART_LSR << shift] & UART_LSR_THRE))

	while (!(uart[UART_LSR << DEBUG_UART_SHIFT] & UART_LSR_THRE))

		barrier();

	uart[UART_TX << shift] = c;

	uart[UART_TX << DEBUG_UART_SHIFT] = c;

}



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;

	u32 chip, div;

	volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE;

	int shift = 2;



	if (uart == NULL)

		return;
@@ -59,10 +61,10 @@ static inline void arch_decomp_setup(void) 
	else

		div = 0x00dd;



	uart[UART_LCR << shift] |= UART_LCR_DLAB;

	uart[UART_DLL << shift] = div & 0xff;

	uart[UART_DLM << shift] = div >> 8;

	uart[UART_LCR << shift] = 3;

	uart[UART_LCR << DEBUG_UART_SHIFT] |= UART_LCR_DLAB;

	uart[UART_DLL << DEBUG_UART_SHIFT] = div & 0xff;

	uart[UART_DLM << DEBUG_UART_SHIFT] = div >> 8;

	uart[UART_LCR << DEBUG_UART_SHIFT] = 3;

}



static inline void arch_decomp_wdog(void)