mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
ee3067c588
Bump kernel to 4.4.44. Compile-tested on ar71xx, ramips/mt7621 and x86/64.
.44 has been run-tested on the 17.01 branch here on ar71xx and mt7621.
Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
(cherry picked from commit 20996edd68)
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Conflicts:
target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch
target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 9a061cea4477f26a1dfcc0a08dc20575016e91df Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
|
Date: Thu, 24 Mar 2016 14:24:20 +0100
|
|
Subject: [PATCH 1/3] serial: imx: fix polarity of RI
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When in DTE mode, the bit USR2_RIIN is active low. So invert the logic
|
|
accordingly.
|
|
|
|
Fixes: 90ebc4838666 ("serial: imx: repair and complete handshaking")
|
|
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
|
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
---
|
|
drivers/tty/serial/imx.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/tty/serial/imx.c
|
|
+++ b/drivers/tty/serial/imx.c
|
|
@@ -817,9 +817,9 @@ static unsigned int imx_get_mctrl(struct
|
|
if (!(usr1 & USR2_DCDIN))
|
|
tmp |= TIOCM_CAR;
|
|
|
|
- /* in DCE mode RIIN is always 0 */
|
|
- if (readl(sport->port.membase + USR2) & USR2_RIIN)
|
|
- tmp |= TIOCM_RI;
|
|
+ if (sport->dte_mode)
|
|
+ if (!(readl(sport->port.membase + USR2) & USR2_RIIN))
|
|
+ tmp |= TIOCM_RI;
|
|
|
|
return tmp;
|
|
}
|