From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 11 Nov 2017 08:33:35 +0000 (+0100)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.81~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c44219a902d38e3503205a521271cf0211a91bba;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch
---

diff --git a/queue-3.18/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch b/queue-3.18/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch
new file mode 100644
index 00000000000..0abf49c5f98
--- /dev/null
+++ b/queue-3.18/mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch
@@ -0,0 +1,42 @@
+From b084116f8587b222a2c5ef6dcd846f40f24b9420 Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+Date: Sun, 29 Oct 2017 16:27:20 +0100
+Subject: MIPS: AR7: Ensure that serial ports are properly set up
+
+From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+
+commit b084116f8587b222a2c5ef6dcd846f40f24b9420 upstream.
+
+Without UPF_FIXED_TYPE, the data from the PORT_AR7 uart_config entry is
+never copied, resulting in a dead port.
+
+Fixes: 154615d55459 ("MIPS: AR7: Use correct UART port type")
+Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+[jonas.gorski: add Fixes tag]
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
+Cc: Nicolas Schichan <nschichan@freebox.fr>
+Cc: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+Cc: linux-mips@linux-mips.org
+Cc: linux-serial@vger.kernel.org
+Patchwork: https://patchwork.linux-mips.org/patch/17543/
+Signed-off-by: James Hogan <jhogan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/ar7/platform.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -581,6 +581,7 @@ static int __init ar7_register_uarts(voi
+ 	uart_port.type		= PORT_AR7;
+ 	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;
+ 	uart_port.iotype	= UPIO_MEM32;
++	uart_port.flags		= UPF_FIXED_TYPE;
+ 	uart_port.regshift	= 2;
+ 
+ 	uart_port.line		= 0;
diff --git a/queue-3.18/series b/queue-3.18/series
index 738c4470569..b49349b2313 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -21,3 +21,4 @@ alsa-seq-fix-oss-sysex-delivery-in-oss-emulation.patch
 alsa-seq-avoid-invalid-lockdep-class-warning.patch
 mips-micromips-fix-incorrect-mask-in-insn_table_mm.patch
 mips-fix-cm-region-target-definitions.patch
+mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch