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

Commit 1ed436cd authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Greg Kroah-Hartman
Browse files

tty: serial: qcom_geni_serial: Allow mctrl when flow control is disabled 



[ Upstream commit e8a6ca808c5ed1e2b43ab25f1f2cbd43a7574f73 ]

The geni set/get_mctrl() functions currently do nothing unless
hardware flow control is enabled. Remove this arbitrary limitation.

Suggested-by: default avatarJohan Hovold <johan@kernel.org>
Fixes: 8a8a66a1 ("tty: serial: qcom_geni_serial: Add support for flow control")
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8c5571b9

drivers/tty/serial/qcom_geni_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport) 
	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;

	u32 geni_ios;



	if (uart_console(uport) || !uart_cts_enabled(uport)) {

	if (uart_console(uport)) {

		mctrl |= TIOCM_CTS;

	} else {

		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
@@ -237,7 +237,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port *uport, 
{

	u32 uart_manual_rfr = 0;



	if (uart_console(uport) || !uart_cts_enabled(uport))

	if (uart_console(uport))

		return;



	if (!(mctrl & TIOCM_RTS))