diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 18:23:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 18:23:32 -0500 |
| commit | 37da7bbbe84fe9e8862940d3f9194fd27dce59bb (patch) | |
| tree | 6c3fae910b4cfd4e2f9a1fdc035400cd4df78be3 | |
| parent | e7cf773d431a63a2417902696fcc9e0ebdc83bbe (diff) | |
| parent | dd63af108f0814f0b589659f4e55a7a5af3b7e53 (diff) | |
Merge tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH:
"Here's the big tty/serial driver update for 3.19-rc1.
There are a number of TTY core changes/fixes in here from Peter Hurley
that have all been teted in linux-next for a long time now. There are
also the normal serial driver updates as well, full details in the
changelog below"
* tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (219 commits)
serial: pxa: hold port.lock when reporting modem line changes
tty-hvsi_lib: Deletion of an unnecessary check before the function call "tty_kref_put"
tty: Deletion of unnecessary checks before two function calls
n_tty: Fix read_buf race condition, increment read_head after pushing data
serial: of-serial: add PM suspend/resume support
Revert "serial: of-serial: add PM suspend/resume support"
Revert "serial: of-serial: fix up PM ops on no_console_suspend and port type"
serial: 8250: don't attempt a trylock if in sysrq
serial: core: Add big-endian iotype
serial: samsung: use port->fifosize instead of hardcoded values
serial: samsung: prefer to use fifosize from driver data
serial: samsung: fix style problems
serial: samsung: wait for transfer completion before clock disable
serial: icom: fix error return code
serial: tegra: clean up tty-flag assignments
serial: Fix io address assign flow with Fintek PCI-to-UART Product
serial: mxs-auart: fix tx_empty against shift register
serial: mxs-auart: fix gpio change detection on interrupt
serial: mxs-auart: Fix mxs_auart_set_ldisc()
serial: 8250_dw: Use 64-bit access for OCTEON.
...
102 files changed, 4755 insertions, 1596 deletions
diff --git a/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt b/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt new file mode 100644 index 000000000000..5c52e5eef16d --- /dev/null +++ b/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | * BCM63xx UART | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | |||
| 5 | - compatible: "brcm,bcm6345-uart" | ||
| 6 | |||
| 7 | - reg: The base address of the UART register bank. | ||
| 8 | |||
| 9 | - interrupts: A single interrupt specifier. | ||
| 10 | |||
| 11 | - clocks: Clock driving the hardware; used to figure out the baud rate | ||
| 12 | divisor. | ||
| 13 | |||
| 14 | Example: | ||
| 15 | |||
| 16 | uart0: serial@14e00520 { | ||
| 17 | compatible = "brcm,bcm6345-uart"; | ||
| 18 | reg = <0x14e00520 0x18>; | ||
| 19 | interrupt-parent = <&periph_intc>; | ||
| 20 | interrupts = <2>; | ||
| 21 | clocks = <&periph_clk>; | ||
| 22 | }; | ||
| 23 | |||
| 24 | clocks { | ||
| 25 | periph_clk: periph_clk@0 { | ||
| 26 | compatible = "fixed-clock"; | ||
| 27 | #clock-cells = <0>; | ||
| 28 | clock-frequency = <54000000>; | ||
| 29 | }; | ||
| 30 | }; | ||
diff --git a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt index 59a40f18d551..7c408c87e613 100644 --- a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt +++ b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt | |||
| @@ -11,8 +11,13 @@ Required properties: | |||
| 11 | - dma-names: "rx" for RX channel, "tx" for TX channel. | 11 | - dma-names: "rx" for RX channel, "tx" for TX channel. |
| 12 | 12 | ||
