Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10af77c1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.4-rc4 into tty-next 



This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 66f75a5d 5f1a3895

arch/arm/mach-omap2/serial.c

+0 −8
Original line number Diff line number Diff line
@@ -245,14 +245,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, 
	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;

	omap_up.autosuspend_timeout = info->autosuspend_timeout;



	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */

	if (!cpu_is_omap2420() && !cpu_is_ti816x())

		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;



	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */

	if (cpu_is_omap34xx() || cpu_is_omap3630())

		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;



	pdata = &omap_up;

	pdata_size = sizeof(struct omap_uart_port_info);

arch/arm/mach-tegra/board-harmony.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/of_serial.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/pda_power.h>
@@ -52,6 +53,7 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		.irq		= INT_UARTD,

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.handle_break	= tegra_serial_handle_break,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= 216000000,

arch/arm/mach-tegra/board-paz00.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/of_serial.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/gpio_keys.h>
@@ -55,6 +56,7 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		.irq		= INT_UARTA,

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.handle_break	= tegra_serial_handle_break,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= 216000000,
@@ -65,6 +67,7 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		.irq		= INT_UARTC,

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.handle_break	= tegra_serial_handle_break,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= 216000000,

arch/arm/mach-tegra/board-seaboard.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/of_serial.h>

#include <linux/i2c.h>

#include <linux/delay.h>

#include <linux/input.h>
@@ -47,6 +48,7 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		/* Memory and IRQ filled in before registration */

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.handle_break	= tegra_serial_handle_break,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= 216000000,

arch/arm/mach-tegra/board-trimslice.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/of_serial.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/gpio.h>
@@ -48,6 +49,7 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		.irq		= INT_UARTA,

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.handle_break	= tegra_serial_handle_break,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= 216000000,