ARM: Tegra: Force PORT_TEGRA as the UART type

8250.c recently gained an explicit PORT_TEGRA port type. Specifically
request this in all Tegra boards' UART platform data.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

4 files changed, 10 insertions, 5 deletions

diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index f528a5a192a6..987dab527e8c 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/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/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 51d847f7fca9..7630c239e7a9 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/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/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index 237a94a1f44a..25446df00006 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/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/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index 89a6d2adc1de..91875b975563 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/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,