Skip to content

Commit

Permalink
arm64: dts: allwinner: pine64: Prepare optional UART nodes with pinctrl
Browse files Browse the repository at this point in the history
Pine64 exposes all A64 UARTs, not just UART0.

Since the pins can be used as GPIO, don't enable the new UART nodes by
default, but prepare the pinctrl settings to aid in activating them via
overlays, i.e., overriding the status property of &uartX nodes.

For UART4 (Euler) the safer route of not including RTS/CTS pins is chosen,
whereas for UART1 (Bluetooth) they are included.

Add the corresponding pinctrl nodes where missing.

Suggested-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Andreas Färber authored and Maxime Ripard committed Jun 7, 2017
1 parent 3b38fde commit 2273aa1
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
29 changes: 29 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,41 @@
status = "okay";
};

/* On Exp and Euler connectors */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};

/* On Wifi/BT connector, with RTS/CTS */
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
status = "disabled";
};

/* On Pi-2 connector */
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "disabled";
};

/* On Euler connector */
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
status = "disabled";
};

/* On Euler connector, RTS/CTS optional */
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&uart4_pins>;
status = "disabled";
};

&usb_otg {
dr_mode = "host";
status = "okay";
Expand Down
15 changes: 15 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@
pins = "PB0", "PB1";
function = "uart2";
};

uart3_pins: uart3-pins {
pins = "PD0", "PD1";
function = "uart3";
};

uart4_pins: uart4-pins {
pins = "PD2", "PD3";
function = "uart4";
};

uart4_rts_cts_pins: uart4-rts-cts-pins {
pins = "PD4", "PD5";
function = "uart4";
};
};

uart0: serial@1c28000 {
Expand Down

0 comments on commit 2273aa1

Please sign in to comment.