4.20-stable review patch. If anyone has any objections, please let me know.
------------------ [ Upstream commit 1ca1c87f91d9dc50d6a38e2177b2032996e7901c ] According to the Schematic, the hardware of ci20 leads to uart3, but not to uart2. Uart2 is miswritten in the original code. Signed-off-by: Zhou Yanjie <zhouyan...@cduestc.edu.cn> Signed-off-by: Paul Burton <paul.bur...@mips.com> Cc: linux-mips <linux-m...@vger.kernel.org> Cc: linux-kernel <linux-kernel@vger.kernel.org> Cc: devicet...@vger.kernel.org Cc: robh...@kernel.org Cc: r...@linux-mips.org Cc: jho...@kernel.org Cc: mark.rutl...@arm.com Cc: ma...@debian.org Cc: ezequ...@collabora.co.uk Cc: ulf.hans...@linaro.org Cc: syq <s...@debian.org> Cc: jiaxun.yang <jiaxun.y...@flygoat.com> Signed-off-by: Sasha Levin <sas...@kernel.org> --- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 50cff3cbcc6d..4f7b1fa31cf5 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -76,7 +76,7 @@ status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&pins_uart2>; + pinctrl-0 = <&pins_uart3>; }; &uart4 { @@ -196,9 +196,9 @@ bias-disable; }; - pins_uart2: uart2 { - function = "uart2"; - groups = "uart2-data", "uart2-hwflow"; + pins_uart3: uart3 { + function = "uart3"; + groups = "uart3-data", "uart3-hwflow"; bias-disable; }; -- 2.19.1