arm64: dts: marvell: add UART muxing on Armada 7K/8K

This commit adds the relevant details in the Armada 7K/8K Device Tree
to properly mux the UART used for the serial console. Since there is
basically only one possible muxing for the UART0 on the AP, the muxing
configuration is described in armada-ap806.dtsi, and selected from the
individual boards (other boards could be using a different UART).

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 9c3bdf87e5433f2a800eae0a2a1e32c8c924dd88..64a8e020c09de83b6c55e2bfb36d31f57ca7c79a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -124,6 +124,8 @@
 
 &uart0 {
        status = "okay";
+       pinctrl-0 = <&uart0_pins>;
+       pinctrl-names = "default";
 };
 
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 0d7b2ae4661002e7443297f680511950c87bfd8f..2a9b68ea73924e38c210d27e32ad6c041a93948b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -139,6 +139,8 @@
 /* Accessible over the mini-USB CON9 connector on the main board */
 &uart0 {
        status = "okay";
+       pinctrl-0 = <&uart0_pins>;
+       pinctrl-names = "default";
 };
 
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index acf5c7d16d79b2f07eedf4691a1fc820073c7ffc..e7a7cbee2fe4fcb8c2f354c1abb2aa5b966340d8 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -101,6 +101,8 @@
 
 &uart0 {
        status = "okay";
+       pinctrl-0 = <&uart0_pins>;
+       pinctrl-names = "default";
 };
 
 &ap_sdhci0 {

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 4d360713ed12459199ca726f34c32266739865dc..1eb51e015002e901c43edc46d618d156c3dba144 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -263,6 +263,11 @@
 
                                ap_pinctrl: pinctrl {
                                        compatible = "marvell,ap806-pinctrl";
+
+                                       uart0_pins: uart0-pins {
+                                               marvell,pins = "mpp11", "mpp19";
+                                               marvell,function = "uart0";
+                                       };
                                };
 
                                ap_gpio: gpio {