summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@bootlin.com>2018-11-22 11:19:35 +0100
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-11-28 15:14:14 +0100
commit89dddc2cb22fae6ff4e88c756ce8a0c70d1665d8 (patch)
tree30735c21cbfd4d38e8809df6e64df8b1a0c4b2b6 /arch/arm/boot
parentARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes (diff)
downloadlinux-89dddc2cb22fae6ff4e88c756ce8a0c70d1665d8.tar.xz
linux-89dddc2cb22fae6ff4e88c756ce8a0c70d1665d8.zip
ARM: dts: sun7i: som204: Use the UART3 TX and RX pin group
The SOM204-EVB doesn't use the CTS pin, and thus was defining its own pinctrl node for the UART3 muxing. Since we split away the TX and RX pin, we can use the global node now, and only have the RTS pin in our local node. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
index 631a80ae958e..249bb57d50e0 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -203,8 +203,8 @@
};
&pio {
- bt_uart_pins: bt_uart_pins@0 {
- pins = "PG6", "PG7", "PG8";
+ uart3_rts_pin: uart3-rts-pin {
+ pins = "PG8";
function = "uart3";
};
};
@@ -296,7 +296,7 @@
/* Used for RTL8723BS bluetooth */
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&bt_uart_pins>;
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_pin>;
status = "okay";
};