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

Commit 37cc6bb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver fixes from Greg KH:
 "Here are a number of small tty and serial driver fixes for reported
  issues for 4.9-rc3. Nothing major, but they do resolve a bunch of
  problems with the tty core changes that are in 4.9-rc1, and finally
  the atmel serial driver is back working properly.

  All have been in linux-next with no reported issues"

* tag 'tty-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: serial_core: fix NULL struct tty pointer access in uart_write_wakeup
  tty: serial_core: Fix serial console crash on port shutdown
  tty/serial: at91: fix hardware handshake on Atmel platforms
  vt: clear selection before resizing
  sc16is7xx: always write state when configuring GPIO as an output
  sh-sci: document R8A7743/5 support
  tty: serial: 8250: 8250_core: NXP SC16C2552 workaround
  tty: limit terminal size to 4M chars
  tty: serial: fsl_lpuart: Fix Tx DMA edge case
  serial: 8250_lpss: enable MSI for sure
  serial: core: fix console problems on uart_close
  serial: 8250_uniphier: fix clearing divisor latch access bit
  serial: 8250_uniphier: fix more unterminated string
  serial: pch_uart: add terminate entry for dmi_system_id tables
  devicetree: bindings: uart: Add new compatible string for ZynqMP
  serial: xuartps: Add new compatible string for ZynqMP
  serial: SERIAL_STM32 should depend on HAS_DMA
  serial: stm32: Fix comparisons with undefined register
  tty: vt, fix bogus division in csi_J
parents 9af6f26a d0f4bce2

Documentation/devicetree/bindings/serial/cdns,uart.txt

+3 −1
Original line number Diff line number Diff line 
Binding for Cadence UART Controller



Required properties:

- compatible : should be "cdns,uart-r1p8", or "xlnx,xuartps"

- compatible :

  Use "xlnx,xuartps","cdns,uart-r1p8" for Zynq-7xxx SoC.

  Use "xlnx,zynqmp-uart","cdns,uart-r1p12" for Zynq Ultrascale+ MPSoC.

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

- interrupts: Should contain UART controller interrupts.

- clocks: Must contain phandles to the UART clocks

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ Required properties: 
    - "renesas,scifb-r8a73a4" for R8A73A4 (R-Mobile APE6) SCIFB compatible UART.

    - "renesas,scifa-r8a7740" for R8A7740 (R-Mobile A1) SCIFA compatible UART.

    - "renesas,scifb-r8a7740" for R8A7740 (R-Mobile A1) SCIFB compatible UART.

    - "renesas,scif-r8a7743" for R8A7743 (RZ/G1M) SCIF compatible UART.

    - "renesas,scifa-r8a7743" for R8A7743 (RZ/G1M) SCIFA compatible UART.

    - "renesas,scifb-r8a7743" for R8A7743 (RZ/G1M) SCIFB compatible UART.

    - "renesas,hscif-r8a7743" for R8A7743 (RZ/G1M) HSCIF compatible UART.

    - "renesas,scif-r8a7745" for R8A7745 (RZ/G1E) SCIF compatible UART.

    - "renesas,scifa-r8a7745" for R8A7745 (RZ/G1E) SCIFA compatible UART.

    - "renesas,scifb-r8a7745" for R8A7745 (RZ/G1E) SCIFB compatible UART.

    - "renesas,hscif-r8a7745" for R8A7745 (RZ/G1E) HSCIF compatible UART.

    - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.

    - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.

    - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

drivers/tty/serial/8250/8250_lpss.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int qrk_serial_setup(struct lpss8250 *lpss, struct uart_port *port) 
	struct pci_dev *pdev = to_pci_dev(port->dev);

	int ret;



	ret = pci_alloc_irq_vectors(pdev, 1, 1, 0);

	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);

	if (ret < 0)

		return ret;

drivers/tty/serial/8250/8250_port.c

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static const struct serial8250_config uart_config[] = { 
		.name		= "16550A",

		.fifo_size	= 16,

		.tx_loadsz	= 16,

		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,

		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 |

				  UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT,

		.rxtrig_bytes	= {1, 4, 8, 14},

		.flags		= UART_CAP_FIFO,

	},

drivers/tty/serial/8250/8250_uniphier.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void uniphier_serial_out(struct uart_port *p, int offset, int value) 
	case UART_LCR:

		valshift = UNIPHIER_UART_LCR_SHIFT;

		/* Divisor latch access bit does not exist. */

		value &= ~(UART_LCR_DLAB << valshift);

		value &= ~UART_LCR_DLAB;

		/* fall through */

	case UART_MCR:

		offset = UNIPHIER_UART_LCR_MCR;
@@ -199,7 +199,7 @@ static int uniphier_uart_probe(struct platform_device *pdev) 


	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!regs) {

		dev_err(dev, "failed to get memory resource");

		dev_err(dev, "failed to get memory resource\n");

		return -EINVAL;

	}