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

Commit 49c35561 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'serial-from-alan' 

* serial-from-alan: (79 commits)
  moxa: prevent opening unavailable ports
  imx: serial: use tty_encode_baud_rate to set true rate
  imx: serial: add IrDA support to serial driver
  imx: serial: use rational library function
  lib: isolate rational fractions helper function
  imx: serial: handle initialisation failure correctly
  imx: serial: be sure to stop xmit upon shutdown
  imx: serial: notify higher layers in case xmit IRQ was not called
  imx: serial: fix one bit field type
  imx: serial: fix whitespaces (no changes in functionality)
  tty: use prepare/finish_wait
  tty: remove sleep_on
  sierra: driver interface blacklisting
  sierra: driver urb handling improvements
  tty: resolve some sierra breakage
  timbuart: Fix the termios logic
  serial: Added Timberdale UART driver
  tty: Add URL for ttydev queue
  devpts: unregister the file system on error
  tty: Untangle termios and mm mutex dependencies
  ...
parents 991ec02c f0e85277

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ P: Person 
M: Mail patches to

L: Mailing list that is relevant to this area

W: Web-page with status/info

T: SCM tree type and location.  Type is one of: git, hg, quilt.

T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.

S: Status, one of the following:



	Supported:	Someone is actually paid to look after this.
@@ -159,7 +159,8 @@ F: drivers/net/r8169.c 
8250/16?50 (AND CLONE UARTS) SERIAL DRIVER

L:	linux-serial@vger.kernel.org

W:	http://serial.sourceforge.net

S:	Orphan

M:	alan@lxorguk.ukuu.org.uk

S:	Odd Fixes

F:	drivers/serial/8250*

F:	include/linux/serial_8250.h
@@ -5629,6 +5630,7 @@ P: Alan Cox 
M:	alan@lxorguk.ukuu.org.uk

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	stgit http://zeniv.linux.org.uk/~alan/ttydev/



TULIP NETWORK DRIVERS

P:	Grant Grundler

arch/arm/plat-mxc/include/mach/imx-uart.h

+5 −0
Original line number Diff line number Diff line
@@ -20,11 +20,16 @@ 
#define ASMARM_ARCH_UART_H



#define IMXUART_HAVE_RTSCTS (1<<0)

#define IMXUART_IRDA        (1<<1)



struct imxuart_platform_data {

	int (*init)(struct platform_device *pdev);

	int (*exit)(struct platform_device *pdev);

	unsigned int flags;

	void (*irda_enable)(int enable);

	unsigned int irda_inv_rx:1;

	unsigned int irda_inv_tx:1;

	unsigned short transceiver_delay;

};



#endif

arch/x86/include/asm/termios.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static inline int user_termio_to_kernel_termios(struct ktermios *termios, 
	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag);

	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag);

	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag);

	get_user(termios->c_line, &termio->c_line);

	return copy_from_user(termios->c_cc, termio->c_cc, NCC);

}

drivers/bluetooth/hci_ldisc.c

+2 −3
Original line number Diff line number Diff line
@@ -277,8 +277,8 @@ static int hci_uart_tty_open(struct tty_struct *tty) 
	/* FIXME: why is this needed. Note don't use ldisc_ref here as the

	   open path is before the ldisc is referencable */



	if (tty->ldisc.ops->flush_buffer)

		tty->ldisc.ops->flush_buffer(tty);

	if (tty->ldisc->ops->flush_buffer)

		tty->ldisc->ops->flush_buffer(tty);

	tty_driver_flush_buffer(tty);



	return 0;
@@ -463,7 +463,6 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file, 
				clear_bit(HCI_UART_PROTO_SET, &hu->flags);

				return err;

			}

			tty->low_latency = 1;

		} else

			return -EBUSY;

		break;

drivers/char/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -97,6 +97,19 @@ config DEVKMEM 
	  kind of kernel debugging operations.

	  When in doubt, say "N".



config BFIN_JTAG_COMM

	tristate "Blackfin JTAG Communication"

	depends on BLACKFIN

	help

	  Add support for emulating a TTY device over the Blackfin JTAG.



	  To compile this driver as a module, choose M here: the

	  module will be called bfin_jtag_comm.



config BFIN_JTAG_COMM_CONSOLE

	bool "Console on Blackfin JTAG"

	depends on BFIN_JTAG_COMM=y



config SERIAL_NONSTANDARD

	bool "Non-standard serial port support"

	depends on HAS_IOMEM