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

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

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

Pull tty/serial fixes from Greg KH:
 "Here are 3 serial driver fixes for 4.0-rc6.  They fix some reported
  issues with the samsung and fsl_lpuart drivers.

  All have been in linux-next for a while"

* tag 'tty-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: serial: fsl_lpuart: clear receive flag on FIFO flush
  tty: serial: fsl_lpuart: specify transmit FIFO size
  serial: samsung: Clear operation mode on UART shutdown
parents 1cced501 8e4934c6

drivers/tty/serial/fsl_lpuart.c

+5 −0
Original line number Diff line number Diff line
@@ -921,6 +921,9 @@ static void lpuart_setup_watermark(struct lpuart_port *sport) 
	writeb(val | UARTPFIFO_TXFE | UARTPFIFO_RXFE,

			sport->port.membase + UARTPFIFO);



	/* explicitly clear RDRF */

	readb(sport->port.membase + UARTSR1);



	/* flush Tx and Rx FIFO */

	writeb(UARTCFIFO_TXFLUSH | UARTCFIFO_RXFLUSH,

			sport->port.membase + UARTCFIFO);
@@ -1076,6 +1079,8 @@ static int lpuart_startup(struct uart_port *port) 
	sport->txfifo_size = 0x1 << (((temp >> UARTPFIFO_TXSIZE_OFF) &

		UARTPFIFO_FIFOSIZE_MASK) + 1);



	sport->port.fifosize = sport->txfifo_size;



	sport->rxfifo_size = 0x1 << (((temp >> UARTPFIFO_RXSIZE_OFF) &

		UARTPFIFO_FIFOSIZE_MASK) + 1);

drivers/tty/serial/samsung.c

+1 −0
Original line number Diff line number Diff line
@@ -963,6 +963,7 @@ static void s3c24xx_serial_shutdown(struct uart_port *port) 
			free_irq(ourport->tx_irq, ourport);

		tx_enabled(port) = 0;

		ourport->tx_claimed = 0;

		ourport->tx_mode = 0;

	}



	if (ourport->rx_claimed) {