From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 Nov 2022 16:38:38 +0000 (+0100)
Subject: Merge 6.1-rc6 into tty-next
X-Git-Tag: v6.6.17~5901^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42a62da0ae660e71c280bd8b287b994c1af1352c;p=platform%2Fkernel%2Flinux-rpi.git

Merge 6.1-rc6 into tty-next

We need the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

42a62da0ae660e71c280bd8b287b994c1af1352c
diff --cc drivers/tty/serial/8250/8250_omap.c
index 7bb9da7,3f33014..734f092
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@@ -348,12 -344,9 +351,12 @@@ static void omap8250_restore_regs(struc
  
  	omap8250_update_mdr1(up, priv);
  
- 	up->port.ops->set_mctrl(&up->port, up->port.mctrl);
+ 	__omap8250_set_mctrl(&up->port, up->port.mctrl);
  
 -	if (up->port.rs485.flags & SER_RS485_ENABLED)
 +	serial_out(up, UART_OMAP_MDR3, priv->mdr3);
 +
 +	if (up->port.rs485.flags & SER_RS485_ENABLED &&
 +	    up->port.rs485_config == serial8250_em485_config)
  		serial8250_em485_stop_tx(up);
  }