summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-07-02 00:14:09 +0200
committerOlof Johansson <olof@lixom.net>2019-07-02 00:14:09 +0200
commit180ae5095246402ed47d57568d8c31568c3c4f18 (patch)
tree37a9a0dee4f9a0956b67387a31b2a5a018a38751 /arch/arm/boot/dts
parentMerge tag 'imx-fixes-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node (diff)
downloadlinux-180ae5095246402ed47d57568d8c31568c3c4f18.tar.xz
linux-180ae5095246402ed47d57568d8c31568c3c4f18.zip
Merge tag 'mvebu-fixes-5.2-2' of git://git.infradead.org/linux-mvebu into arm/fixes
mvebu fixes for 5.2 (part 2) Use the armada-38x-uart compatible strings for Armada XP 98dx3236 SoCs in order to not loose character anymore. * tag 'mvebu-fixes-5.2-2' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
-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 59753470cd34..267d0c178e55 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";
+};
+