Revert "serial: 8250: properly set mctrl for prescaler"

chaitu236 · chaitu236 · commit 58853dfe3d68 · 2025-03-04T14:33:05.000-06:00
This reverts commit 84fa133. Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c
@@ -268,9 +268,8 @@ static u8 ni16550_read_fifo_size(struct uart_8250_port *uart, int reg)
 
 static void ni16550_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
-	struct uart_8250_port *up = up_to_u8250p(port);
+	mctrl |= UART_MCR_CLKSEL;
 
-	up->mcr |= UART_MCR_CLKSEL;
 	serial8250_do_set_mctrl(port, mctrl);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,8 @@ static u8 ni16550_read_fifo_size(struct uart_8250_port *uart, int reg)`
`268`	`268`
`269`	`269`	`static void ni16550_set_mctrl(struct uart_port *port, unsigned int mctrl)`
`270`	`270`	`{`
`271`		`- struct uart_8250_port *up = up_to_u8250p(port);`
	`271`	`+ mctrl \|= UART_MCR_CLKSEL;`
`272`	`272`
`273`		`- up->mcr \|= UART_MCR_CLKSEL;`
`274`	`273`	`serial8250_do_set_mctrl(port, mctrl);`
`275`	`274`	`}`
`276`	`275`