mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-11 02:59:12 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Thomas Petazzoni 2017-08-30 12:16:06 +02:00 committed by Gregory CLEMENT
parent 2bd6bf03f4
commit 9e83bbdb6f
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/boot/dts/marvell/armada-7040-db.dts
View file

@ -124,6 +124,8 @@ partition@400000 {
&uart0 {
status = "okay";
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};

2
arch/arm64/boot/dts/marvell/armada-8040-db.dts
View file

@ -139,6 +139,8 @@ partition@400000 {
/* Accessible over the mini-USB CON9 connector on the main board */
&uart0 {
status = "okay";
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};

2
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
View file

@ -101,6 +101,8 @@ usb3h0_phy: usb3_phy0 {
&uart0 {
status = "okay";
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};
&ap_sdhci0 {

5
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
View file

@ -263,6 +263,11 @@ ap_clk: clock {
ap_pinctrl: pinctrl {
compatible = "marvell,ap806-pinctrl";
uart0_pins: uart0-pins {
marvell,pins = "mpp11", "mpp19";
marvell,function = "uart0";
};
};
ap_gpio: gpio {