From 68693f61f1e6a6bc9b33862a9755babc685dbead Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 2 Sep 2011 16:27:45 +0530 Subject: arm: tegra: cardhu: Debug console should be UartB for E1256 Setting debug console to be UARTB for E1256 bug 871620 Change-Id: Ie1e97997d0b47a3b3eff2ba4ecfb0af5dc920d41 Reviewed-on: http://git-master/r/50498 Tested-by: Kuan Luo Reviewed-by: Laxman Dewangan --- arch/arm/mach-tegra/board-cardhu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'arch/arm/mach-tegra/board-cardhu.c') diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index f44fff632b13..85b52de00efc 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -560,10 +560,15 @@ static void __init uart_debug_init(void) struct board_info board_info; tegra_get_board_info(&board_info); - if (board_info.sku & SKU_SLT_ULPI_SUPPORT) { - if ((board_info.board_id == BOARD_E1186) || - (board_info.board_id == BOARD_E1187) || - (board_info.board_id == BOARD_PM269)) { + /* UARTB is debug port + * for SLT - E1186/E1187/PM269 + * for E1256 + */ + if (((board_info.sku & SKU_SLT_ULPI_SUPPORT) && + ((board_info.board_id == BOARD_E1186) || + (board_info.board_id == BOARD_E1187) || + (board_info.board_id == BOARD_PM269))) || + (board_info.board_id == BOARD_E1256)) { /* UARTB is the debug port. */ pr_info("Selecting UARTB as the debug console\n"); cardhu_uart_devices[1] = &debug_uartb_device; @@ -571,9 +576,6 @@ static void __init uart_debug_init(void) debug_uart_port_base = ((struct plat_serial8250_port *)( debug_uartb_device.dev.platform_data))->mapbase; return; - } - pr_err("%s(): Unhandled SKU information for Board 0x%04x\n", - __func__, board_info.board_id); } /* UARTA is the debug port. */ pr_info("Selecting UARTA as the debug console\n"); -- cgit v1.2.3