From 052d0cd0ba687598e124b8d6982c57221c0264ed Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Wed, 16 Mar 2022 18:06:47 +0100
Subject: [PATCH] boards: arm: bbc_microbit_v2: migrate to pinctrl

Use pinctrl instead of `-pin` properties.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 .../bbc_microbit_v2-pinctrl.dtsi              | 37 +++++++++++++++++++
 .../arm/bbc_microbit_v2/bbc_microbit_v2.dts   | 11 ++++--
 .../bbc_microbit_v2/bbc_microbit_v2_defconfig |  2 +
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi

diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi b/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi
new file mode 100644
index 00000000000..a91c7674688
--- /dev/null
+++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 6)>,
+				<NRF_PSEL(UART_RX, 1, 8)>;
+		};
+	};
+
+	uart0_sleep: uart0_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 6)>,
+				<NRF_PSEL(UART_RX, 1, 8)>;
+			low-power-enable;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 16)>,
+				<NRF_PSEL(TWIM_SCL, 0, 8)>;
+		};
+	};
+
+	i2c0_sleep: i2c0_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 16)>,
+				<NRF_PSEL(TWIM_SCL, 0, 8)>;
+			low-power-enable;
+		};
+	};
+
+};
diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts b/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
index 2dae9b4759d..2631f280b0f 100644
--- a/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
+++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52833_qiaa.dtsi>
+#include "bbc_microbit_v2-pinctrl.dtsi"
 
 / {
 	model = "BBC Micro:bit V2";
@@ -111,19 +112,21 @@
 	compatible = "nordic,nrf-uart";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <6>;
-	rx-pin = <40>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
 };
 
 &i2c0 {
 	compatible = "nordic,nrf-twim";
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
-	sda-pin = <16>;
-	scl-pin = <8>;
 
 	/* See https://tech.microbit.org/hardware/i2c/ for board variants */
 
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-1 = <&i2c0_sleep>;
+	pinctrl-names = "default", "sleep";
 	lsm303agr-magn@1e {
 		compatible = "st,lis2mdl", "st,lsm303agr-magn";
 		status = "okay";
diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig b/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig
index f4d34eb3599..970aabdd1fb 100644
--- a/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig
+++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig
@@ -17,3 +17,5 @@ CONFIG_SERIAL=y
 # enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
+
+CONFIG_PINCTRL=y