From 2b9148f3f09b79a0ce2ddbb71aa2eb1ddcb1a60e Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 2 Mar 2013 22:56:32 +0100 Subject: colibri_t20/30: rename uarts Rename UARTs to be consistent with Colibri FF/BT/STDUART naming. --- arch/arm/mach-tegra/board-colibri_t20.c | 6 +++--- arch/arm/mach-tegra/board-colibri_t30.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index c14b3f5e2670..5d88dbc8bb50 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -884,9 +884,9 @@ late_initcall(colibri_t20_thermal_debug_init); /* UART */ static struct platform_device *colibri_t20_uart_devices[] __initdata = { - &tegra_uarta_device, /* FF */ - &tegra_uartb_device, /* STD */ - &tegra_uartd_device, /* BT */ + &tegra_uarta_device, /* Colibri FFUART */ + &tegra_uartd_device, /* Colibri BTUART */ + &tegra_uartb_device, /* Colibri STDUART */ }; static struct uart_clk_parent uart_parent_clk[] = { diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index caff878a202f..efec2ef6e337 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -781,9 +781,9 @@ static void colibri_t30_thermd_alert_init(void) /* UART */ static struct platform_device *colibri_t30_uart_devices[] __initdata = { - &tegra_uarta_device, /* FF */ - &tegra_uartb_device, /* STD */ - &tegra_uartd_device, /* BT */ + &tegra_uarta_device, /* Colibri FFUART */ + &tegra_uartd_device, /* Colibri BTUART */ + &tegra_uartb_device, /* Colibri STDUART */ }; static struct uart_clk_parent uart_parent_clk[] = { @@ -818,7 +818,7 @@ static void __init uart_debug_init(void) case 1: /* UARTB is the debug port. */ pr_info("Selecting UARTB as the debug console\n"); - colibri_t30_uart_devices[1] = &debug_uartb_device; + colibri_t30_uart_devices[2] = &debug_uartb_device; debug_uart_clk = clk_get_sys("serial8250.0", "uartb"); debug_uart_port_base = ((struct plat_serial8250_port *)( debug_uartb_device.dev.platform_data))->mapbase; @@ -827,7 +827,7 @@ static void __init uart_debug_init(void) case 3: /* UARTD is the debug port. */ pr_info("Selecting UARTD as the debug console\n"); - colibri_t30_uart_devices[2] = &debug_uartd_device; + colibri_t30_uart_devices[1] = &debug_uartd_device; debug_uart_clk = clk_get_sys("serial8250.0", "uartd"); debug_uart_port_base = ((struct plat_serial8250_port *)( debug_uartd_device.dev.platform_data))->mapbase; -- cgit v1.2.3