arm64: dts: marvell: add UART aliases and define stdout-path

This commit adds the necessary UART aliases to the main Armada 7K/8K
.dtsi file, and uses them to define the /chosen/stdout-path property
on the Armada 7040 DB board.

Suggested-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index ee5778395beabf8cfa8b52e0db9033fae0569637..4b01744038b3737013fd4bcd54c52be69d4577bc 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -51,6 +51,10 @@
        compatible = "marvell,armada7040-db", "marvell,armada7040",
                     "marvell,armada-ap806-quad", "marvell,armada-ap806";
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory@00000000 {
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x80000000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index ca42c36480044b73760f0a622e107882d0ddb0dd..9e2c1f9e78bc0f9f25565a3f49959c243ef08f98 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -54,6 +54,11 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        psci {
                compatible = "arm,psci-0.2";
                method = "smc";