evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "serial: msm_serial_hs: Align to HW assisted flow control support"

Browse source
This commit is contained in:
Linux Build Service Account 2019-05-20 09:12:58 -07:00 • committed by Gerrit - the friendly Code Review server
commit 64c7fea7a6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/tty/serial/msm_serial_hs.c
View file

@ -3,7 +3,7 @@
* MSM 7k High speed uart driver * MSM 7k High speed uart driver
* *
* Copyright (c) 2008 Google Inc. * Copyright (c) 2008 Google Inc.
* Copyright (c) 2007-2018, The Linux Foundation. All rights reserved. * Copyright (c) 2007-2019, The Linux Foundation. All rights reserved.
* Modified: Nick Pelly <npelly@google.com> * Modified: Nick Pelly <npelly@google.com>
* *
* All source code in this file is licensed under the following license * All source code in this file is licensed under the following license
@ -1185,6 +1185,7 @@ static void msm_hs_set_termios(struct uart_port *uport,
data |= EIGHT_BPC; data |= EIGHT_BPC;
break; break;
} }
uport->status &= ~(UPSTAT_AUTOCTS);
/* stop bits */ /* stop bits */
if (c_cflag & CSTOPB) { if (c_cflag & CSTOPB) {
data |= STOP_BIT_TWO; data |= STOP_BIT_TWO;
@ -1229,6 +1230,7 @@ static void msm_hs_set_termios(struct uart_port *uport,
if (c_cflag & CRTSCTS) { if (c_cflag & CRTSCTS) {
data |= UARTDM_MR1_CTS_CTL_BMSK; data |= UARTDM_MR1_CTS_CTL_BMSK;
data |= UARTDM_MR1_RX_RDY_CTL_BMSK; data |= UARTDM_MR1_RX_RDY_CTL_BMSK;
uport->status |= UPSTAT_AUTOCTS;
msm_uport->flow_control = true; msm_uport->flow_control = true;
} }
msm_hs_write(uport, UART_DM_MR1, data); msm_hs_write(uport, UART_DM_MR1, data);