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

Commit 8f3207c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial updates from Greg KH:
 "Here is the "big" TTY/Serial patch updates for 4.12-rc1

  Not a lot of new things here, the normal number of serial driver
  updates and additions, tiny bugs fixed, and some core files split up
  to make future changes a bit easier for Nicolas's "tiny-tty" work.

  All of these have been in linux-next for a while"

* tag 'tty-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (62 commits)
  serial: small Makefile reordering
  tty: split job control support into a file of its own
  tty: move baudrate handling code to a file of its own
  console: move console_init() out of tty_io.c
  serial: 8250_early: Add earlycon support for Palmchip UART
  tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44
  vt: make mouse selection of non-ASCII consistent
  vt: set mouse selection word-chars to gpm's default
  imx-serial: Reduce RX DMA startup latency when opening for reading
  serial: omap: suspend device on probe errors
  serial: omap: fix runtime-pm handling on unbind
  tty: serial: omap: add UPF_BOOT_AUTOCONF flag for DT init
  serial: samsung: Remove useless spinlock
  serial: samsung: Add missing checks for dma_map_single failure
  serial: samsung: Use right device for DMA-mapping calls
  serial: imx: setup DCEDTE early and ensure DCD and RI irqs to be off
  tty: fix comment typo s/repsonsible/responsible/
  tty: amba-pl011: Fix spurious TX interrupts
  serial: xuartps: Enable clocks in the pm disable case also
  serial: core: Re-use struct uart_port {name} field
  ...
parents bf5f8946 8e1c21f4

Documentation/devicetree/bindings/arm/sprd.txt

+8 −5
Original line number Diff line number Diff line 
Spreadtrum SoC Platforms Device Tree Bindings

----------------------------------------------------



Sharkl64 is a Spreadtrum's SoC Platform which is based

on ARM 64-bit processor.

SC9836 openphone Board

Required root node properties:

	- compatible = "sprd,sc9836-openphone", "sprd,sc9836";



SC9836 openphone board with SC9836 SoC based on the

Sharkl64 Platform shall have the following properties.

SC9860 SoC

Required root node properties:

	- compatible = "sprd,sc9860"



SP9860G 3GFHD Board

Required root node properties:

        - compatible = "sprd,sc9836-openphone", "sprd,sc9836";
 
	- compatible = "sprd,sp9860g-1h10", "sprd,sc9860";

Documentation/devicetree/bindings/serial/sprd-uart.txt

+13 −1
Original line number Diff line number Diff line 
* Spreadtrum serial UART



Required properties:

- compatible: must be "sprd,sc9836-uart"

- compatible: must be one of:

  * "sprd,sc9836-uart"

  * "sprd,sc9860-uart", "sprd,sc9836-uart"



- reg: offset and length of the register set for the device

- interrupts: exactly one interrupt specifier

- clocks: phandles to input clocks.



Example:

	uart0: serial@0 {

		compatible = "sprd,sc9860-uart",

			     "sprd,sc9836-uart";

		reg = <0x0 0x100>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&ext_26m>;

	};

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8418,7 +8418,7 @@ MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER 
M:	Richard Genoud <richard.genoud@gmail.com>

S:	Maintained

F:	drivers/tty/serial/atmel_serial.c

F:	include/linux/atmel_serial.h

F:	drivers/tty/serial/atmel_serial.h



MICROCHIP / ATMEL DMA DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

drivers/tty/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_TTY)		+= tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \

				   tty_buffer.o tty_port.o tty_mutex.o tty_ldsem.o

				   tty_buffer.o tty_port.o tty_mutex.o \

				   tty_ldsem.o tty_baudrate.o tty_jobctrl.o

obj-$(CONFIG_LEGACY_PTYS)	+= pty.o

obj-$(CONFIG_UNIX98_PTYS)	+= pty.o

obj-$(CONFIG_AUDIT)		+= tty_audit.o

drivers/tty/hvc/hvc_console.c

+2 −2
Original line number Diff line number Diff line
@@ -920,17 +920,17 @@ int hvc_remove(struct hvc_struct *hp) 


	tty = tty_port_tty_get(&hp->port);



	console_lock();

	spin_lock_irqsave(&hp->lock, flags);

	if (hp->index < MAX_NR_HVC_CONSOLES) {

		console_lock();

		vtermnos[hp->index] = -1;

		cons_ops[hp->index] = NULL;

		console_unlock();

	}



	/* Don't whack hp->irq because tty_hangup() will need to free the irq. */



	spin_unlock_irqrestore(&hp->lock, flags);

	console_unlock();



	/*

	 * We 'put' the instance that was grabbed when the kref instance