summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-08-30 12:16:06 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-09-19 15:50:19 +0200
commit9e83bbdb6fc3414a46ce92ceafa53f0067bc1f57 (patch)
tree2c58ee09f931bdfc192ee23e29664c400cb35230 /arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
parent2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff)
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>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index acf5c7d16d79..e7a7cbee2fe4 100644
--- 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 {