| From 0a768f86438e18ab182b477c11f8e69e40092a31 Mon Sep 17 00:00:00 2001 |
| From: Matthias Kaehlcke <mka@chromium.org> |
| Date: Fri, 18 Jan 2019 16:23:05 -0800 |
| Subject: 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: Johan Hovold <johan@kernel.org> |
| Fixes: 8a8a66a1a18a ("tty: serial: qcom_geni_serial: Add support for flow control") |
| Signed-off-by: Matthias Kaehlcke <mka@chromium.org> |
| Reviewed-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tty/serial/qcom_geni_serial.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c |
| index 1515074e18fb6..35d1f6fa0e3c3 100644 |
| --- a/drivers/tty/serial/qcom_geni_serial.c |
| +++ b/drivers/tty/serial/qcom_geni_serial.c |
| @@ -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)) |
| -- |
| 2.19.1 |
| |
