Commit 7195eefb authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

serial: fsl_lpuart: Call core's sanitization and remove custom one 



Serial core handles serial_rs485 sanitization. Remove custom
sanitization from lpuart_config_rs485.

This change loses dev_err when SER_RS485_RX_DURING_TX is set due to
incorrect configuration. Other drivers do not do similar prinout for
full-duplex case and it should be done in serial core if it is
desirable to notify on this condition. Personally, I doesn't see it
important because the kernel gracefully downgrades to half-duplex.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220606100433.13793-31-ilpo.jarvinen@linux.intel.com


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

drivers/tty/serial/fsl_lpuart.c

+0 −17
Original line number Diff line number Diff line
@@ -1365,11 +1365,6 @@ static int lpuart_config_rs485(struct uart_port *port, 
		~(UARTMODEM_TXRTSPOL | UARTMODEM_TXRTSE);

	writeb(modem, sport->port.membase + UARTMODEM);



	/* clear unsupported configurations */

	rs485->delay_rts_before_send = 0;

	rs485->delay_rts_after_send = 0;

	rs485->flags &= ~SER_RS485_RX_DURING_TX;



	if (rs485->flags & SER_RS485_ENABLED) {

		/* Enable auto RS-485 RTS mode */

		modem |= UARTMODEM_TXRTSE;
@@ -1400,11 +1395,6 @@ static int lpuart32_config_rs485(struct uart_port *port, 
				& ~(UARTMODEM_TXRTSPOL | UARTMODEM_TXRTSE);

	lpuart32_write(&sport->port, modem, UARTMODIR);



	/* clear unsupported configurations */

	rs485->delay_rts_before_send = 0;

	rs485->delay_rts_after_send = 0;

	rs485->flags &= ~SER_RS485_RX_DURING_TX;



	if (rs485->flags & SER_RS485_ENABLED) {

		/* Enable auto RS-485 RTS mode */

		modem |= UARTMODEM_TXRTSE;
@@ -2723,13 +2713,6 @@ static int lpuart_probe(struct platform_device *pdev) 
	if (ret)

		goto failed_get_rs485;



	if (sport->port.rs485.flags & SER_RS485_RX_DURING_TX)

		dev_err(&pdev->dev, "driver doesn't support RX during TX\n");



	if (sport->port.rs485.delay_rts_before_send ||

	    sport->port.rs485.delay_rts_after_send)

		dev_err(&pdev->dev, "driver doesn't support RTS delays\n");



	uart_rs485_config(&sport->port);



	ret = devm_request_irq(&pdev->dev, sport->port.irq, handler, 0,