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

Commit 94b5aff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 



Pull TTY updates from Greg Kroah-Hartman:
 "Here's the big TTY/serial driver pull request for the 3.5-rc1 merge
  window.

  Nothing major in here, just lots of incremental changes from Alan and
  Jiri reworking some tty core things to behave better and to get a more
  solid grasp on some of the nasty tty locking issues.

  There are a few tty and serial driver updates in here as well.

  All of this has been in the linux-next releases for a while with no
  problems.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)
  serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.
  serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.
  serial: bfin_uart: narrow the reboot condition in DMA tx interrupt
  serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.
  Revert "serial_core: Update buffer overrun statistics."
  tty: hvc_xen: NULL dereference on allocation failure
  tty: Fix LED error return
  tty: Allow uart_register/unregister/register
  tty: move global ldisc idle waitqueue to the individual ldisc
  serial8250-em: Add DT support
  serial8250-em: clk_get() IS_ERR() error handling fix
  serial_core: Update buffer overrun statistics.
  tty: drop the pty lock during hangup
  cris: fix missing tty arg in wait_event_interruptible_tty call
  tty/amiserial: Add missing argument for tty_unlock()
  tty_lock: Localise the lock
  pty: Lock the devpts bits privately
  tty_lock: undo the old tty_lock use on the ctty
  serial8250-em: Emma Mobile UART driver V2
  Add missing call to uart_update_timeout()
  ...
parents 5d4e2d08 59bd234b

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>
@@ -48,6 +49,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>
@@ -49,6 +50,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,