aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-01-31 01:56:38 -0500
committerGregory CLEMENT <gregory.clement@bootlin.com>2018-02-14 06:05:53 -0500
commit4d5a12493518041f6fa66be40e7123dc90c004cd (patch)
treedaaa6acd80f9624ce50534e83fc23b0d6d06c725
parentff1c516ed1187a23a9c35ca1d8ed179983546ad1 (diff)
arm64: dts: marvell: mcbin: enable uart headers
Add description of the J25 and J27 UART headers of the Macchiatobin. They use uart peripherals that the CP0 (J25) and CP1 (J27) provide. Even though J25 and J27 are labeled as UART header, the pins on these headers can be muxed for other purposes. But the UART functionality is useful when the board is mounted in an ATX style enclosure, since the console UART is not accessible through the microUSB at CON9. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts22
1 files changed, 22 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 626e9d0462c3..122d2257ebc4 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -163,6 +163,13 @@
163 }; 163 };
164}; 164};
165 165
166/* J25 UART header */
167&cp0_uart1 {
168 pinctrl-names = "default";
169 pinctrl-0 = <&cp0_uart1_pins>;
170 status = "okay";
171};
172
166&cp0_mdio { 173&cp0_mdio {
167 pinctrl-names = "default"; 174 pinctrl-names = "default";
168 pinctrl-0 = <&cp0_ge_mdio_pins>; 175 pinctrl-0 = <&cp0_ge_mdio_pins>;
@@ -195,6 +202,10 @@
195 marvell,pins = "mpp37", "mpp38"; 202 marvell,pins = "mpp37", "mpp38";
196 marvell,function = "i2c0"; 203 marvell,function = "i2c0";
197 }; 204 };
205 cp0_uart1_pins: uart1-pins {
206 marvell,pins = "mpp40", "mpp41";
207 marvell,function = "uart1";
208 };
198 cp0_xhci_vbus_pins: xhci0-vbus-pins { 209 cp0_xhci_vbus_pins: xhci0-vbus-pins {
199 marvell,pins = "mpp47"; 210 marvell,pins = "mpp47";
200 marvell,function = "gpio"; 211 marvell,function = "gpio";
@@ -290,6 +301,17 @@
290 marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16"; 301 marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16";
291 marvell,function = "spi1"; 302 marvell,function = "spi1";
292 }; 303 };
304 cp1_uart0_pins: uart0-pins {
305 marvell,pins = "mpp6", "mpp7";
306 marvell,function = "uart0";
307 };
308};
309
310/* J27 UART header */
311&cp1_uart0 {
312 pinctrl-names = "default";
313 pinctrl-0 = <&cp1_uart0_pins>;
314 status = "okay";
293}; 315};
294 316
295&cp1_sata0 { 317&cp1_sata0 {