boards: nrf52840dk_nrf52840: add pinctrl support for uart

This patch changes old pin based configuration to the state based
pinctrl configuration. All pin selection and GPIO configuration are now
described in devicetree.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840-pinctrl.dtsi

@@ -0,0 +1,27 @@
+&pinctrl {
+	/* UART0 */
+	uart0_default: uart0_default {
+		pincfg = <PINCTRL_NRF(0, 6, OUT, IDISC, PN, UART_TX)
+			  PINCTRL_NRF(0, 8, INP, ICONN, PU, UART_RX)
+			  PINCTRL_NRF(0, 5, OUT, IDISC, PN, UART_RTS)
+			  PINCTRL_NRF(0, 7, INP, ICONN, PU, UART_CTS)>;
+	};
+
+	uart0_sleep: uart0_sleep {
+		pincfg = <PINCTRL_NRF(0, 6, INP, IDISC, PN, UART_TX)
+			  PINCTRL_NRF(0, 8, INP, IDISC, PN, UART_RX)
+			  PINCTRL_NRF(0, 5, INP, IDISC, PN, UART_RTS)
+			  PINCTRL_NRF(0, 7, INP, IDISC, PN, UART_CTS)>;
+	};
+
+	/* UART1 */
+	uart1_default: uart1_default {
+		pincfg = <PINCTRL_NRF(1, 2, OUT, IDISC, PN, UART_TX)
+			  PINCTRL_NRF(1, 1, INP, ICONN, PU, UART_RX)>;
+	};
+
+	uart1_sleep: uart1_sleep {
+		pincfg = <PINCTRL_NRF(1, 2, INP, IDISC, PN, UART_TX)
+			  PINCTRL_NRF(1, 1, INP, IDISC, PN, UART_RX)>;
+	};
+};

boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts

@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include "nrf52840dk_nrf52840-pinctrl.dtsi"
 
 / {
 	model = "Nordic nRF52840 DK NRF52840";
@@ -144,20 +145,19 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <6>;
-	rx-pin = <8>;
-	rx-pull-up;
-	rts-pin = <5>;
-	cts-pin = <7>;
-	cts-pull-up;
+
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
 };
 
 arduino_serial: &uart1 {
 	status = "okay";
 	current-speed = <115200>;
-	rx-pin = <33>;
-	rx-pull-up;
-	tx-pin = <34>;
+
+	pinctrl-0 = <&uart1_default>;
+	pinctrl-1 = <&uart1_sleep>;
+	pinctrl-names = "default", "sleep";
 };
 
 arduino_i2c: &i2c0 {

boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig

@@ -25,3 +25,5 @@ CONFIG_UART_CONSOLE=y
 
 # additional board options
 CONFIG_GPIO_AS_PINRESET=y
+
+CONFIG_PINCTRL=y