Commit d377eb0d authored by Colin Cross's avatar Colin Cross
Browse files

ARM: tegra: Centralize macros to define debug uart base 



Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 100b33c8

arch/arm/mach-tegra/include/mach/debug-macro.S

+5 −20
Original line number Diff line number Diff line
@@ -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

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

+14 −0
Original line number Diff line number Diff line
@@ -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

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

+2 −16
Original line number Diff line number Diff line
@@ -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)