From fb590b3d37cbcece8bb8433aaba5728c2bfb5368 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 8 Aug 2011 15:01:05 -0600
Subject: [PATCH] --- yaml --- r: 272779 b: refs/heads/master c:
 11b3adb45da636a839bd2b7c300c616e0e2c38d6 h: refs/heads/master i:   272777:
 753cd978d347d7fcebb37809b58f07fd0a496df3   272775:
 3a0c9c6f2dd9fb5db580b0695664987f3e07ce46 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-tegra/board-harmony.c   | 3 ++-
 trunk/arch/arm/mach-tegra/board-paz00.c     | 6 ++++--
 trunk/arch/arm/mach-tegra/board-seaboard.c  | 3 ++-
 trunk/arch/arm/mach-tegra/board-trimslice.c | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c550fce2eb2e..57dade9569ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24810cb53c0c66eb2922117c6a53c64c3f7a07a6
+refs/heads/master: 11b3adb45da636a839bd2b7c300c616e0e2c38d6
diff --git a/trunk/arch/arm/mach-tegra/board-harmony.c b/trunk/arch/arm/mach-tegra/board-harmony.c
index f528a5a192a6..987dab527e8c 100644
--- a/trunk/arch/arm/mach-tegra/board-harmony.c
+++ b/trunk/arch/arm/mach-tegra/board-harmony.c
@@ -49,7 +49,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
 		.membase	= IO_ADDRESS(TEGRA_UARTD_BASE),
 		.mapbase	= TEGRA_UARTD_BASE,
 		.irq		= INT_UARTD,
-		.flags		= UPF_BOOT_AUTOCONF,
+		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= 216000000,
diff --git a/trunk/arch/arm/mach-tegra/board-paz00.c b/trunk/arch/arm/mach-tegra/board-paz00.c
index 51d847f7fca9..7630c239e7a9 100644
--- a/trunk/arch/arm/mach-tegra/board-paz00.c
+++ b/trunk/arch/arm/mach-tegra/board-paz00.c
@@ -50,7 +50,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
 		.membase	= IO_ADDRESS(TEGRA_UARTA_BASE),
 		.mapbase	= TEGRA_UARTA_BASE,
 		.irq		= INT_UARTA,
-		.flags		= UPF_BOOT_AUTOCONF,
+		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= 216000000,
@@ -59,7 +60,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
 		.membase	= IO_ADDRESS(TEGRA_UARTD_BASE),
 		.mapbase	= TEGRA_UARTD_BASE,
 		.irq		= INT_UARTD,
-		.flags		= UPF_BOOT_AUTOCONF,
+		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= 216000000,
diff --git a/trunk/arch/arm/mach-tegra/board-seaboard.c b/trunk/arch/arm/mach-tegra/board-seaboard.c
index 237a94a1f44a..25446df00006 100644
--- a/trunk/arch/arm/mach-tegra/board-seaboard.c
+++ b/trunk/arch/arm/mach-tegra/board-seaboard.c
@@ -44,7 +44,8 @@
 static struct plat_serial8250_port debug_uart_platform_data[] = {
 	{
 		/* Memory and IRQ filled in before registration */
-		.flags		= UPF_BOOT_AUTOCONF,
+		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= 216000000,
diff --git a/trunk/arch/arm/mach-tegra/board-trimslice.c b/trunk/arch/arm/mach-tegra/board-trimslice.c
index 89a6d2adc1de..91875b975563 100644
--- a/trunk/arch/arm/mach-tegra/board-trimslice.c
+++ b/trunk/arch/arm/mach-tegra/board-trimslice.c
@@ -46,7 +46,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
 		.membase	= IO_ADDRESS(TEGRA_UARTA_BASE),
 		.mapbase	= TEGRA_UARTA_BASE,
 		.irq		= INT_UARTA,
-		.flags		= UPF_BOOT_AUTOCONF,
+		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= 216000000,