From 52e6e31ebceb37d76e2e72faf645a2242f78bfec Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Wed, 6 Nov 2024 15:49:38 +0100
Subject: [PATCH] [nrf fromtree] boards nrfbsim: Enable GPIO & GPIOTE
 peripherals for nrf5340bsim

The HW models now support these pheripherals, let's enable them

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit d0746f1177fd16fad4acf39effa827685708b881)
---
 .../nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts   | 19 +++++++++++++------
 .../nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml  |  3 ++-
 .../nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts   | 18 ++++++++++++------
 .../nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml  |  3 ++-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
index 256b9bfb875..f70d06aae75 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -35,9 +35,6 @@
 		/delete-property/ i2s-0;
 		/delete-property/ qdec-0;
 		/delete-property/ qdec-1;
-		/delete-property/ gpio-0;
-		/delete-property/ gpio-1;
-		/delete-property/ gpiote-0;
 	};
 
 	chosen {
@@ -82,11 +79,8 @@
 			/delete-node/ regulator@37000;
 			/delete-node/ kmu@39000;
 			/delete-node/ vmc@81000;
-			/delete-node/ gpio@842500;
-			/delete-node/ gpio@842800;
 		};
 		/delete-node/ spu@50003000;
-		/delete-node/ gpiote@5000d000;
 		/delete-node/ crypto@50844000;
 	};
 
@@ -112,6 +106,19 @@
 	};
 };
 
+
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
  * buffer won't be used.
  */
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
index 055bc9e578f..8e0cdf59fb7 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml
@@ -9,7 +9,8 @@ toolchain:
   - zephyr
 testing:
   ignore_tags:
-    - gpio
     - modem
     - uart
     - bsim_skip_CI
+supported:
+  - gpio
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
index d7d6a2fe75d..0b9d3a79d1a 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -17,12 +17,9 @@
 	aliases {
 		/delete-property/ sram-0;
 		/delete-property/ sram-1;
-		/delete-property/ gpiote-0;
 		/delete-property/ wdt-0;
 		/delete-property/ i2c-0;
 		/delete-property/ spi-0;
-		/delete-property/ gpio-0;
-		/delete-property/ gpio-1;
 	};
 
 	chosen {
@@ -36,14 +33,11 @@
 	soc {
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@21000000;
-		/delete-node/ gpiote@4100a000;
 		/delete-node/ watchdog@4100b000;
 		/delete-node/ i2c@41013000;
 		/delete-node/ spi@41013000;
 		/delete-node/ acl@41080000;
 		/delete-node/ vmc@41081000;
-		/delete-node/ gpio@418c0500;
-		/delete-node/ gpio@418c0800;
 	};
 
 	/delete-node/ cpus;
@@ -73,6 +67,18 @@
 	};
 };
 
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
  * buffer won't be used.
  */
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
index f88fb9c6ca8..c774a3a5782 100644
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml
@@ -9,7 +9,8 @@ toolchain:
   - zephyr
 testing:
   ignore_tags:
-    - gpio
     - modem
     - uart
     - bsim_skip_CI
+supported:
+  - gpio