From 2e44835b2185987bd5815f8cd49e45077b3644ea Mon Sep 17 00:00:00 2001
From: Rafal Dyla <rafal.dyla@nordicsemi.no>
Date: Mon, 27 Jan 2025 09:25:57 +0100
Subject: [PATCH] modules: hal_nordic: Adding SWEXT service

Adding support for SWEXT (SWitch EXTernal) peripheral.

Signed-off-by: Rafal Dyla <rafal.dyla@nordicsemi.no>
---
 modules/hal_nordic/nrfs/CMakeLists.txt | 3 ++-
 modules/hal_nordic/nrfs/Kconfig        | 8 ++++++++
 modules/hal_nordic/nrfs/nrfs_config.h  | 4 ++++
 soc/nordic/nrf54h/Kconfig              | 2 ++
 west.yml                               | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index 41dfb61f864..cf738fe5bf2 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -25,13 +25,14 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_CLOCK_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_clock.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DIAG_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_diag.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DVFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_dvfs.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_GDPWR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdpwr.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_MRAM_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_mram.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_PMIC_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_pmic.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_SWEXT_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_swext.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_TEMP_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_temp.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_VBUS_DETECTOR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_usb.c)
-        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources(${SRC_DIR}/internal/nrfs_dispatcher.c)
         add_subdirectory_ifdef(CONFIG_NRFS_DVFS_LOCAL_DOMAIN dvfs)
 
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index cf40a64f592..0684ec222be 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -34,6 +34,9 @@ config NRFS_HAS_PMIC_SERVICE
 config NRFS_HAS_RESET_SERVICE
 	bool
 
+config NRFS_HAS_SWEXT_SERVICE
+	bool
+
 config NRFS_HAS_TEMP_SERVICE
 	bool
 
@@ -125,6 +128,11 @@ config NRFS_GDFS_SERVICE_ENABLED
 	depends on NRFS_HAS_GDFS_SERVICE
 	default y
 
+config NRFS_SWEXT_SERVICE_ENABLED
+	bool "SWEXT peripheral control service"
+	depends on NRFS_HAS_SWEXT_SERVICE
+	default y
+
 endmenu
 
 rsource "backends/Kconfig"
diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h
index 392c2019dfe..da3cc1ada1b 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -52,6 +52,10 @@
 #define NRFS_GDFS_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_SWEXT_SERVICE_ENABLED
+#define NRFS_SWEXT_SERVICE_ENABLED
+#endif
+
 #ifdef CONFIG_SOC_POSIX
 #define NRFS_UNIT_TESTS_ENABLED
 #endif
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 10428b77ec7..fa4ca5eb9bc 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -28,6 +28,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_PM
@@ -52,6 +53,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
diff --git a/west.yml b/west.yml
index 1df4665d7c0..254d589a930 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: a1db06a2f6a1d069994d595cef563f58e44c4344
+      revision: 1e1048562ff98563d492c8dcab1ee85775547abc
       path: modules/hal/nordic
       groups:
         - hal