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

Commit a9724125 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver patches from Greg KH:
 "Here's the big tty/serial driver update for 3.20-rc1.  Nothing huge
  here, just lots of driver updates and some core tty layer fixes as
  well.  All have been in linux-next with no reported issues"

* tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  serial: 8250: Fix UART_BUG_TXEN workaround
  serial: driver for ETRAX FS UART
  tty: remove unused variable sprop
  serial: of-serial: fetch line number from DT
  serial: samsung: earlycon support depends on CONFIG_SERIAL_SAMSUNG_CONSOLE
  tty/serial: serial8250_set_divisor() can be static
  tty/serial: Add Spreadtrum sc9836-uart driver support
  Documentation: DT: Add bindings for Spreadtrum SoC Platform
  serial: samsung: remove redundant interrupt enabling
  tty: Remove external interface for tty_set_termios()
  serial: omap: Fix RTS handling
  serial: 8250_omap: Use UPSTAT_AUTORTS for RTS handling
  serial: core: Rework hw-assisted flow control support
  tty/serial: 8250_early: Add support for PXA UARTs
  tty/serial: of_serial: add support for PXA/MMP uarts
  tty/serial: of_serial: add DT alias ID handling
  serial: 8250: Prevent concurrent updates to shadow registers
  serial: 8250: Use canary to restart console after suspend
  serial: 8250: Refactor XR17V35X divisor calculation
  serial: 8250: Refactor divisor programming
  ...
parents 46f7b635 c09babfa

Documentation/devicetree/bindings/arm/sprd.txt

0 → 100644
+11 −0
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 with SC9836 SoC based on the

Sharkl64 Platform shall have the following properties.



Required root node properties:

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

Documentation/devicetree/bindings/serial/digicolor-usart.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Binding for Conexant Digicolor USART



Note: this binding is only applicable for using the USART peripheral as

UART. USART also support synchronous serial protocols like SPI and I2S. Use

the binding that matches the wiring of your system.



Required properties:

- compatible : should be "cnxt,cx92755-usart".

- reg: Should contain USART controller registers location and length.

- interrupts: Should contain a single USART controller interrupt.

- clocks: Must contain phandles to the USART clock

  See ../clocks/clock-bindings.txt for details.



Note: Each UART port should have an alias correctly numbered

in "aliases" node.



Example:

	aliases {

		serial0 = &uart0;

	};



	uart0: uart@f0000740 {

		compatible = "cnxt,cx92755-usart";

		reg = <0xf0000740 0x20>;

		clocks = <&main_clk>;

		interrupts = <44>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Required properties:

- compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",

		"sirf,marco-uart" or "sirf,marco-bt-uart" which means

		"sirf,atlas7-uart" or "sirf,atlas7-bt-uart" which means

		uart located in BT module and used for BT.

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

- interrupts : Should contain uart interrupt
@@ -37,7 +37,7 @@ usp@b0090000 { 
for uart use in BT module,

uart6: uart@11000000 {

	cell-index = <6>;

	compatible = "sirf,marco-bt-uart", "sirf,marco-uart";

	compatible = "sirf,atlas7-bt-uart", "sirf,atlas7-uart";

	reg = <0x11000000 0x1000>;

	interrupts = <0 100 0>;

	clocks = <&clks 138>, <&clks 140>, <&clks 141>;

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

0 → 100644
+7 −0
Original line number Diff line number Diff line 
* Spreadtrum serial UART



Required properties:

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

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

- interrupts: exactly one interrupt specifier

- clocks: phandles to input clocks.

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ chrp Common Hardware Reference Platform 
chunghwa	Chunghwa Picture Tubes Ltd.

cirrus	Cirrus Logic, Inc.

cnm	Chips&Media, Inc.

cnxt	Conexant Systems, Inc.

cortina	Cortina Systems, Inc.

cosmic	Cosmic Circuits

crystalfontz	Crystalfontz America, Inc.
@@ -162,6 +163,7 @@ snps Synopsys, Inc. 
solidrun	SolidRun

sony	Sony Corporation

spansion	Spansion Inc.

sprd	Spreadtrum Communications Inc.

st	STMicroelectronics

ste	ST-Ericsson

stericsson	ST-Ericsson