[nrf fromtree] boards: arm: nrf: use UICR nfc-pins-as-gpios devicetre…

…e property Instead of CONFIG_NFCT_PINS_AS_GPIOS (about to be deprecated). Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit dd568d0)
MarGasiorek · Oct 9, 2023 · 848f5bf · 848f5bf
1 parent 0e3c0a4
commit 848f5bf
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 7 deletions.
diff --git a/boards/arm/bt610/bt610.dts b/boards/arm/bt610/bt610.dts
@@ -143,6 +143,10 @@
 	status = "okay";
 };
 
+&uicr {
+	nfct-pins-as-gpios;
+};
+
 &gpio0 {
 	status = "okay";
 };

diff --git a/boards/arm/bt610/bt610_defconfig b/boards/arm/bt610/bt610_defconfig
@@ -9,7 +9,6 @@ CONFIG_ARM_MPU=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-CONFIG_NFCT_PINS_AS_GPIOS=y
 
 # Enable uart driver
 CONFIG_SERIAL=y

diff --git a/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle.dts b/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle.dts
@@ -87,6 +87,10 @@
 	status = "okay";
 };
 
+&uicr {
+	nfct-pins-as-gpios;
+};
+
 &gpio0 {
 	status = "okay";
 };

diff --git a/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig b/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig
@@ -15,6 +15,5 @@ CONFIG_GPIO=y
 
 # additional board options
 CONFIG_GPIO_AS_PINRESET=y
-CONFIG_NFCT_PINS_AS_GPIOS=y
 
 CONFIG_PINCTRL=y
diff --git a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts
@@ -99,6 +99,10 @@
 	status = "okay";
 };
 
+&uicr {
+	nfct-pins-as-gpios;
+};
+
 &gpio0 {
 	status = "okay";
 };

diff --git a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig
@@ -15,7 +15,6 @@ CONFIG_GPIO=y
 
 # additional board options
 CONFIG_GPIO_AS_PINRESET=y
-CONFIG_NFCT_PINS_AS_GPIOS=y
 
 CONFIG_PINCTRL=y
 

diff --git a/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_nrf5340_cpuapp.dts b/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_nrf5340_cpuapp.dts
@@ -20,3 +20,7 @@
 		zephyr,sram-non-secure-partition = &sram0_ns;
 	};
 };
+
+&uicr {
+	nfct-pins-as-gpios;
+};
diff --git a/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_nrf5340_cpuapp_defconfig b/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_nrf5340_cpuapp_defconfig
@@ -12,7 +12,6 @@ CONFIG_HW_STACK_PROTECTION=y
 CONFIG_ARM_TRUSTZONE_M=y
 
 CONFIG_GPIO=y
-CONFIG_NFCT_PINS_AS_GPIOS=y
 
 CONFIG_SERIAL=y
 

diff --git a/boards/arm/pinetime_devkit0/pinetime_devkit0.dts b/boards/arm/pinetime_devkit0/pinetime_devkit0.dts
@@ -87,6 +87,10 @@
 	status = "okay";
 };
 
+&uicr {
+	nfct-pins-as-gpios;
+};
+
 &gpio0 {
 	status = "okay";
 

diff --git a/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig b/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig
@@ -13,9 +13,6 @@ CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# use P0.09 and P0.10 as GPIOs
-CONFIG_NFCT_PINS_AS_GPIOS=y
-
 # use P0.21 as RST
 CONFIG_GPIO_AS_PINRESET=y
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,7 @@ @@
     		zephyr,sram-non-secure-partition = &sram0_ns;
     	};
     };
+    &uicr {
+    	nfct-pins-as-gpios;
+    };