drop broken 3.18 tty patch

diff --git a/queue-3.18/series b/queue-3.18/series
index 671e22ff05ae7e9e29494019f2d839d67436c401..b8f0ca2e999474ad64e6433bb5df5f600f5d6ef3 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -26,7 +26,6 @@ udf-fix-bug-on-corrupted-inode.patch
 arm-pxa-avoid-section-mismatch-warning.patch
 asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch
 memstick-prevent-memstick-host-from-getting-runtime-.patch
-tty-serial-samsung-properly-set-flags-in-autocts-mod.patch
 arm64-kvm-skip-mmio-insn-after-emulation.patch
 powerpc-uaccess-fix-warning-error-with-access_ok.patch
 xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch

diff --git a/queue-3.18/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch b/queue-3.18/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch
deleted file mode 100644 (file)
index f241bf5..0000000
--- a/queue-3.18/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 304129186b08b1d352652e39129e577c038261af Mon Sep 17 00:00:00 2001
-From: Beomho Seo <beomho.seo@samsung.com>
-Date: Fri, 14 Dec 2018 12:34:08 +0100
-Subject: tty: serial: samsung: Properly set flags in autoCTS mode
-
-[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ]
-
-Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support")
-has changed the way the autoCTS mode is handled.
-
-According to that change, serial drivers which enable H/W autoCTS mode must
-set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling
-TX. This patch adds proper handling of UPSTAT_AUTOCTS flag.
-
-Signed-off-by: Beomho Seo <beomho.seo@samsung.com>
-[mszyprow: rephrased commit message]
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/samsung.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
-index 957992ceba0a..67cbc5647c36 100644
---- a/drivers/tty/serial/samsung.c
-+++ b/drivers/tty/serial/samsung.c
-@@ -817,11 +817,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
-       wr_regl(port, S3C2410_ULCON, ulcon);
-       wr_regl(port, S3C2410_UBRDIV, quot);
- 
-+      port->status &= ~UPSTAT_AUTOCTS;
-+
-       umcon = rd_regl(port, S3C2410_UMCON);
-       if (termios->c_cflag & CRTSCTS) {
-               umcon |= S3C2410_UMCOM_AFC;
-               /* Disable RTS when RX FIFO contains 63 bytes */
-               umcon &= ~S3C2412_UMCON_AFC_8;
-+              port->status = UPSTAT_AUTOCTS;
-       } else {
-               umcon &= ~S3C2410_UMCOM_AFC;
-       }
--- 
-2.19.1
-