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

Commit 4ff69041 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Greg Kroah-Hartman
Browse files

tty: serial: fsl_lpuart: Introduce lpuart32_configure() 



Code doing final steps of TX/RX configuration in lpuart32_startup()
and lpuart_resume() is identical, so move it into a standalone
subroutine.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-imx@nxp.com
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: https://lore.kernel.org/r/20190805185701.22863-4-andrew.smirnov@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd60e8e4

drivers/tty/serial/fsl_lpuart.c

+21 −27
Original line number Diff line number Diff line
@@ -1502,6 +1502,24 @@ static int lpuart_startup(struct uart_port *port) 
	return 0;

}



static void lpuart32_configure(struct lpuart_port *sport)

{

	unsigned long temp;



	if (sport->lpuart_dma_rx_use) {

		/* RXWATER must be 0 */

		temp = lpuart32_read(&sport->port, UARTWATER);

		temp &= ~(UARTWATER_WATER_MASK << UARTWATER_RXWATER_OFF);

		lpuart32_write(&sport->port, temp, UARTWATER);

	}

	temp = lpuart32_read(&sport->port, UARTCTRL);

	if (!sport->lpuart_dma_rx_use)

		temp |= UARTCTRL_RIE;

	if (!sport->lpuart_dma_tx_use)

		temp |= UARTCTRL_TIE;

	lpuart32_write(&sport->port, temp, UARTCTRL);

}



static int lpuart32_startup(struct uart_port *port)

{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
@@ -1530,18 +1548,7 @@ static int lpuart32_startup(struct uart_port *port) 
	lpuart_rx_dma_startup(sport);

	lpuart_tx_dma_startup(sport);



	if (sport->lpuart_dma_rx_use) {

		/* RXWATER must be 0 */

		temp = lpuart32_read(&sport->port, UARTWATER);

		temp &= ~(UARTWATER_WATER_MASK << UARTWATER_RXWATER_OFF);

		lpuart32_write(&sport->port, temp, UARTWATER);

	}

	temp = lpuart32_read(&sport->port, UARTCTRL);

	if (!sport->lpuart_dma_rx_use)

		temp |= UARTCTRL_RIE;

	if (!sport->lpuart_dma_tx_use)

		temp |= UARTCTRL_TIE;

	lpuart32_write(&sport->port, temp, UARTCTRL);

	lpuart32_configure(sport);



	spin_unlock_irqrestore(&sport->port.lock, flags);

	return 0;
@@ -2579,21 +2586,8 @@ static int lpuart_resume(struct device *dev) 


	lpuart_tx_dma_startup(sport);



	if (lpuart_is_32(sport)) {

		if (sport->lpuart_dma_rx_use) {

			/* RXWATER must be 0 */

			temp = lpuart32_read(&sport->port, UARTWATER);

			temp &= ~(UARTWATER_WATER_MASK <<

				  UARTWATER_RXWATER_OFF);

			lpuart32_write(&sport->port, temp, UARTWATER);

		}

		temp = lpuart32_read(&sport->port, UARTCTRL);

		if (!sport->lpuart_dma_rx_use)

			temp |= UARTCTRL_RIE;

		if (!sport->lpuart_dma_tx_use)

			temp |= UARTCTRL_TIE;

		lpuart32_write(&sport->port, temp, UARTCTRL);

	}

	if (lpuart_is_32(sport))

		lpuart32_configure(sport);



	uart_resume_port(&lpuart_reg, &sport->port);