arm64: dts: marvell: add UART muxing on Armada 7K/8K
Subsystems (3)
PATCH 1/1 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).
--- arch/arm64/boot/dts/marvell/armada-7040-db.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 5 +++++ 4 files changed, 11 insertions(+)
arch/arm64/boot/dts/marvell/armada-7040-db.dts +2 -0
@@ -124,6 +124,8 @@ &uart0 { status = "okay"; + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; };
arch/arm64/boot/dts/marvell/armada-8040-db.dts +2 -0
@@ -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"; };
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +2 -0
@@ -101,6 +101,8 @@ &uart0 { status = "okay"; + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; }; &ap_sdhci0 {
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +5 -0
@@ -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 {
Signature · 1 line
2.9.4
PATCH 1/1 arm64: dts: marvell: add UART muxing on Armada 7K/8K
Hi Thomas,
Quoted 7 lines · Thomas Petazzoni
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 <[email protected]>
Applied on mvebu/dt64-4.15
Thanks,
Gregory
Quoted 65 lines
--- arch/arm64/boot/dts/marvell/armada-7040-db.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 5 +++++ 4 files changed, 11 insertions(+)arch/arm64/boot/dts/marvell/armada-7040-db.dts +2
-0@@ -124,6 +124,8 @@ &uart0 { status = "okay"; + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; };arch/arm64/boot/dts/marvell/armada-8040-db.dts +2
-0@@ -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"; };arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +2
-0@@ -101,6 +101,8 @@ &uart0 { status = "okay"; + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; }; &ap_sdhci0 {arch/arm64/boot/dts/marvell/armada-ap806.dtsi +5
-0@@ -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 {Signature · 1 line
2.9.4
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com