From 8862b8cc34d470b8ec1442aad3180e9211cea2d5 Mon Sep 17 00:00:00 2001 From: Rafal Dyla Date: Wed, 4 Jun 2025 08:52:20 +0200 Subject: [PATCH] modules: hal_nordic: nrfs: Disabling subscription - Code optimization for platforms which don't use subscription feature in the temperature service. - Test adaptation to code changes Signed-off-by: Rafal Dyla --- drivers/sensor/nordic/temp/Kconfig | 4 ++-- modules/hal_nordic/nrfs/Kconfig | 8 ++++++++ modules/hal_nordic/nrfs/nrfs_config.h | 4 ++++ soc/nordic/nrf92/Kconfig | 2 ++ .../temp_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 1 - west.yml | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/sensor/nordic/temp/Kconfig b/drivers/sensor/nordic/temp/Kconfig index e32fb1b8fdd60..6641fcf5cb29d 100644 --- a/drivers/sensor/nordic/temp/Kconfig +++ b/drivers/sensor/nordic/temp/Kconfig @@ -28,11 +28,11 @@ config TEMP_NRFS Enable driver for nRF temperature sensor accessed through the nRF Services (nrfs) layer. -if TEMP_NRFS +if TEMP_NRFS && NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED module = TEMP_NRFS thread_priority = 10 thread_stack_size = 1024 source "drivers/sensor/Kconfig.trigger_template" -endif # TEMP_NRFS +endif diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig index f5d4e92f94de3..166520d9d0178 100644 --- a/modules/hal_nordic/nrfs/Kconfig +++ b/modules/hal_nordic/nrfs/Kconfig @@ -46,6 +46,9 @@ config NRFS_HAS_TEMP_SERVICE config NRFS_HAS_VBUS_DETECTOR_SERVICE bool +config NRFS_TEMP_SERVICE_HAS_SUBSCRIPTION_SERVICE + bool + config NRFS bool "nRF Services Support" select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \ @@ -93,6 +96,11 @@ config NRFS_TEMP_SERVICE_ENABLED depends on NRFS_HAS_TEMP_SERVICE default y +config NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED + bool "Subscription feature for the temperature service" + depends on NRFS_TEMP_SERVICE_HAS_SUBSCRIPTION_SERVICE + default y + config NRFS_VBUS_DETECTOR_SERVICE_ENABLED bool "VBUS detector for the USB peripheral" depends on NRFS_HAS_VBUS_DETECTOR_SERVICE diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h index 9d1a9b7b6b35b..3ef87a8af3931 100644 --- a/modules/hal_nordic/nrfs/nrfs_config.h +++ b/modules/hal_nordic/nrfs/nrfs_config.h @@ -12,6 +12,10 @@ #define NRFS_TEMP_SERVICE_ENABLED #endif +#ifdef CONFIG_NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED +#define NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED +#endif + #ifdef CONFIG_NRFS_MRAM_SERVICE_ENABLED #define NRFS_MRAM_SERVICE_ENABLED #endif diff --git a/soc/nordic/nrf92/Kconfig b/soc/nordic/nrf92/Kconfig index a7769c00b6f27..eea33654f57d1 100644 --- a/soc/nordic/nrf92/Kconfig +++ b/soc/nordic/nrf92/Kconfig @@ -28,6 +28,7 @@ config SOC_NRF9230_ENGB_CPUAPP select NRFS_HAS_PMIC_SERVICE select NRFS_HAS_TEMP_SERVICE select NRFS_HAS_VBUS_DETECTOR_SERVICE + select NRFS_TEMP_SERVICE_HAS_SUBSCRIPTION_SERVICE config SOC_NRF9230_ENGB_CPURAD select ARM @@ -46,6 +47,7 @@ config SOC_NRF9230_ENGB_CPURAD select NRFS_HAS_MRAM_SERVICE select NRFS_HAS_PMIC_SERVICE select NRFS_HAS_TEMP_SERVICE + select NRFS_TEMP_SERVICE_HAS_SUBSCRIPTION_SERVICE config SOC_NRF9230_ENGB_CPUPPR select RISCV_CORE_NORDIC_VPR diff --git a/tests/drivers/sensor/temp_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/sensor/temp_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 371797173d979..219e5ebb46ed2 100644 --- a/tests/drivers/sensor/temp_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/drivers/sensor/temp_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,2 +1 @@ CONFIG_NRFS=y -CONFIG_TEMP_NRFS_TRIGGER_OWN_THREAD=y diff --git a/west.yml b/west.yml index 192f79e9e1635..b697556ea5d87 100644 --- a/west.yml +++ b/west.yml @@ -200,7 +200,7 @@ manifest: groups: - hal - name: hal_nordic - revision: 2f5d4e5868ab573eac932fa4bc142565073c3c04 + revision: a6579483deb33112cc763d05a4a3f8085883c1ac path: modules/hal/nordic groups: - hal