From: Tony Lindgren <tony@atomide.com>
Date: Fri, 20 Jan 2017 20:13:19 +0000 (-0800)
Subject: ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~7^2~1421
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2e589f305b005ff7ca34922c9323eec0a47c48a;p=linux-4.9.git

ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6


[ Upstream commit 4cd6a59f5c1a9b0cca0da09fbba42b9450ffc899 ]

We have more than four uarts on some SoCs and that can cause
noise with errors while booting.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 53e1a884a1ea..66d71963761d 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -216,6 +216,7 @@ CONFIG_SERIO=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y