aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Scott <joshua.scott@alliedtelesis.co.nz>2019-06-26 10:11:08 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-10 09:53:43 +0200
commit7cab3dfa6d74ff16cf8f1e09f7ffbb07f2498fb1 (patch)
tree0fd315f391bce1bd330babbfedb4fb4d34058e30
parentc8790d7f76be43997e11e3e88857cf841b42b35f (diff)
downloadlinux-stable-7cab3dfa6d74ff16cf8f1e09f7ffbb07f2498fb1.tar.gz
ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
commit 80031361747aec92163464f2ee08870fec33bcb0 upstream. Switch to the "marvell,armada-38x-uart" driver variant to empty the UART buffer before writing to the UART_LCR register. Signed-off-by: Joshua Scott <joshua.scott@alliedtelesis.co.nz> Tested-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>. Cc: stable@vger.kernel.org Fixes: 43e28ba87708 ("ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236") Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/armada-xp-98dx3236.dtsi8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index 8d708cc2249588..3e7d093d7a9a24 100644
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -336,3 +336,11 @@
status = "disabled";
};
+&uart0 {
+ compatible = "marvell,armada-38x-uart";
+};
+
+&uart1 {
+ compatible = "marvell,armada-38x-uart";
+};
+