Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Petazzoni and committed by
Gregory CLEMENT
9e83bbdb 2bd6bf03

+11
+2
arch/arm64/boot/dts/marvell/armada-7040-db.dts
··· 124 124 125 125 &uart0 { 126 126 status = "okay"; 127 + pinctrl-0 = <&uart0_pins>; 128 + pinctrl-names = "default"; 127 129 }; 128 130 129 131
+2
arch/arm64/boot/dts/marvell/armada-8040-db.dts
··· 139 139 /* Accessible over the mini-USB CON9 connector on the main board */ 140 140 &uart0 { 141 141 status = "okay"; 142 + pinctrl-0 = <&uart0_pins>; 143 + pinctrl-names = "default"; 142 144 }; 143 145 144 146
+2
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
··· 101 101 102 102 &uart0 { 103 103 status = "okay"; 104 + pinctrl-0 = <&uart0_pins>; 105 + pinctrl-names = "default"; 104 106 }; 105 107 106 108 &ap_sdhci0 {
+5
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
··· 263 263 264 264 ap_pinctrl: pinctrl { 265 265 compatible = "marvell,ap806-pinctrl"; 266 + 267 + uart0_pins: uart0-pins { 268 + marvell,pins = "mpp11", "mpp19"; 269 + marvell,function = "uart0"; 270 + }; 266 271 }; 267 272 268 273 ap_gpio: gpio {